merged sparse file fix from RC_0_16

This commit is contained in:
Arvid Norberg
2013-02-16 08:26:55 +00:00
parent 5133fec4ca
commit e45c71dd30
10 changed files with 146 additions and 65 deletions

View File

@@ -764,6 +764,10 @@ void test_check_files(std::string const& test_path
io.join();
}
#ifdef TORRENT_NO_DEPRECATE
#define storage_mode_compact storage_mode_sparse
#endif
void run_test(std::string const& test_path, bool unbuffered)
{
std::cerr << "\n=== " << test_path << " ===\n" << std::endl;
@@ -903,6 +907,7 @@ void test_fastresume(std::string const& test_path)
break;
}
}
// TODO: 3 don't use this deprecated function
resume = h.write_resume_data();
ses.remove_torrent(h, session::delete_files);
}
@@ -990,6 +995,7 @@ void test_rename_file_in_fastresume(std::string const& test_path)
std::cout << "stop loop" << std::endl;
torrent_status s = h.status();
TEST_CHECK(s.state == torrent_status::seeding);
// TODO: 3 don't use this deprecated function
resume = h.write_resume_data();
ses.remove_torrent(h);
}
@@ -1022,6 +1028,7 @@ void test_rename_file_in_fastresume(std::string const& test_path)
torrent_status stat = h.status();
TEST_CHECK(stat.state == torrent_status::seeding);
// TODO: 3 don't use this deprecated function
resume = h.write_resume_data();
ses.remove_torrent(h);
}

View File

@@ -84,7 +84,9 @@ void test_transfer(boost::intrusive_ptr<torrent_info> torrent_file
p.flags &= ~add_torrent_params::flag_auto_managed;
p.ti = torrent_file;
p.save_path = "tmp2_web_seed";
#ifndef TORRENT_NO_DEPRECATE
p.storage_mode = storage_mode_compact;
#endif
torrent_handle th = ses.add_torrent(p, ec);
std::vector<announce_entry> empty;