merged test fix from RC_0_16
This commit is contained in:
parent
e43407778d
commit
0465d6325d
|
@ -68,7 +68,7 @@ void display_pe_settings(libtorrent::pe_settings s)
|
||||||
|
|
||||||
void test_transfer(libtorrent::pe_settings::enc_policy policy,
|
void test_transfer(libtorrent::pe_settings::enc_policy policy,
|
||||||
libtorrent::pe_settings::enc_level level = libtorrent::pe_settings::both,
|
libtorrent::pe_settings::enc_level level = libtorrent::pe_settings::both,
|
||||||
bool pref_rc4 = false, bool encrypted_torrent = false)
|
bool pref_rc4 = false)
|
||||||
{
|
{
|
||||||
using namespace libtorrent;
|
using namespace libtorrent;
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ void test_transfer(libtorrent::pe_settings::enc_policy policy,
|
||||||
|
|
||||||
using boost::tuples::ignore;
|
using boost::tuples::ignore;
|
||||||
boost::tie(tor1, tor2, ignore) = setup_transfer(&ses1, &ses2, 0, true, false, true
|
boost::tie(tor1, tor2, ignore) = setup_transfer(&ses1, &ses2, 0, true, false, true
|
||||||
, "_pe", 16 * 1024, 0, false, 0, true, encrypted_torrent);
|
, "_pe", 16 * 1024, 0, false, 0, true);
|
||||||
|
|
||||||
fprintf(stderr, "waiting for transfer to complete\n");
|
fprintf(stderr, "waiting for transfer to complete\n");
|
||||||
|
|
||||||
|
@ -196,11 +196,6 @@ int test_main()
|
||||||
test_enc_handler(&aes1, &aes2);
|
test_enc_handler(&aes1, &aes2);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
test_transfer(pe_settings::enabled, pe_settings::both, false, true);
|
|
||||||
test_transfer(pe_settings::enabled, pe_settings::both, true, true);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
test_transfer(pe_settings::disabled);
|
test_transfer(pe_settings::disabled);
|
||||||
|
|
||||||
test_transfer(pe_settings::forced, pe_settings::plaintext);
|
test_transfer(pe_settings::forced, pe_settings::plaintext);
|
||||||
|
|
Loading…
Reference in New Issue