fix test_ssl for trunk, where tests are run in separate directories
This commit is contained in:
parent
0465d6325d
commit
7a0c4654a3
|
@ -107,7 +107,7 @@ void test_ssl(int test_idx)
|
||||||
|
|
||||||
create_directory("tmp1_ssl", ec);
|
create_directory("tmp1_ssl", ec);
|
||||||
std::ofstream file("tmp1_ssl/temporary");
|
std::ofstream file("tmp1_ssl/temporary");
|
||||||
boost::intrusive_ptr<torrent_info> t = ::create_torrent(&file, 16 * 1024, 13, false, "ssl/root_ca_cert.pem");
|
boost::intrusive_ptr<torrent_info> t = ::create_torrent(&file, 16 * 1024, 13, false, "../ssl/root_ca_cert.pem");
|
||||||
file.close();
|
file.close();
|
||||||
|
|
||||||
add_torrent_params addp;
|
add_torrent_params addp;
|
||||||
|
@ -124,17 +124,19 @@ void test_ssl(int test_idx)
|
||||||
|
|
||||||
if (test.seed_has_cert)
|
if (test.seed_has_cert)
|
||||||
{
|
{
|
||||||
tor1.set_ssl_certificate(combine_path("ssl", "peer_certificate.pem")
|
tor1.set_ssl_certificate(
|
||||||
, combine_path("ssl", "peer_private_key.pem")
|
combine_path("..", combine_path("ssl", "peer_certificate.pem"))
|
||||||
, combine_path("ssl", "dhparams.pem")
|
, combine_path("..", combine_path("ssl", "peer_private_key.pem"))
|
||||||
|
, combine_path("..", combine_path("ssl", "dhparams.pem"))
|
||||||
, "test");
|
, "test");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (test.downloader_has_cert)
|
if (test.downloader_has_cert)
|
||||||
{
|
{
|
||||||
tor2.set_ssl_certificate(combine_path("ssl", "peer_certificate.pem")
|
tor2.set_ssl_certificate(
|
||||||
, combine_path("ssl", "peer_private_key.pem")
|
combine_path("..", combine_path("ssl", "peer_certificate.pem"))
|
||||||
, combine_path("ssl", "dhparams.pem")
|
, combine_path("..", combine_path("ssl", "peer_private_key.pem"))
|
||||||
|
, combine_path("..", combine_path("ssl", "dhparams.pem"))
|
||||||
, "test");
|
, "test");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue