merged fixes from RC_0_16

This commit is contained in:
Arvid Norberg
2013-05-11 22:00:54 +00:00
parent cf7a2a098e
commit bdf0e1764b
6 changed files with 23 additions and 10 deletions

View File

@@ -127,8 +127,8 @@ int test_main()
{
// make sure we disambiguated the files
TEST_EQUAL(ti->num_files(), 2);
TEST_CHECK(ti->file_at(0).path == "temp/foo/bar.txt");
TEST_CHECK(ti->file_at(1).path == "temp/foo/bar.1.txt");
TEST_CHECK(ti->file_at(0).path == combine_path(combine_path("temp", "foo"), "bar.txt"));
TEST_CHECK(ti->file_at(1).path == combine_path(combine_path("temp", "foo"), "bar.1.txt"));
}
else if (std::string(test_torrents[i].file) == "pad_file.torrent")
{