From 7a0c4654a38bb87f422246f2e88ddfadbfc00005 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 29 Jul 2013 09:26:05 +0000 Subject: [PATCH] fix test_ssl for trunk, where tests are run in separate directories --- test/test_ssl.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/test_ssl.cpp b/test/test_ssl.cpp index 901500d0b..65d751dee 100644 --- a/test/test_ssl.cpp +++ b/test/test_ssl.cpp @@ -107,7 +107,7 @@ void test_ssl(int test_idx) create_directory("tmp1_ssl", ec); std::ofstream file("tmp1_ssl/temporary"); - boost::intrusive_ptr t = ::create_torrent(&file, 16 * 1024, 13, false, "ssl/root_ca_cert.pem"); + boost::intrusive_ptr t = ::create_torrent(&file, 16 * 1024, 13, false, "../ssl/root_ca_cert.pem"); file.close(); add_torrent_params addp; @@ -124,17 +124,19 @@ void test_ssl(int test_idx) if (test.seed_has_cert) { - tor1.set_ssl_certificate(combine_path("ssl", "peer_certificate.pem") - , combine_path("ssl", "peer_private_key.pem") - , combine_path("ssl", "dhparams.pem") + tor1.set_ssl_certificate( + combine_path("..", combine_path("ssl", "peer_certificate.pem")) + , combine_path("..", combine_path("ssl", "peer_private_key.pem")) + , combine_path("..", combine_path("ssl", "dhparams.pem")) , "test"); } if (test.downloader_has_cert) { - tor2.set_ssl_certificate(combine_path("ssl", "peer_certificate.pem") - , combine_path("ssl", "peer_private_key.pem") - , combine_path("ssl", "dhparams.pem") + tor2.set_ssl_certificate( + combine_path("..", combine_path("ssl", "peer_certificate.pem")) + , combine_path("..", combine_path("ssl", "peer_private_key.pem")) + , combine_path("..", combine_path("ssl", "dhparams.pem")) , "test"); }