diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-02 19:57:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-02 19:57:36 +0300 |
| commit | 0665da9d5fe353069c418158fd9b6ecad75f0889 (patch) | |
| tree | 5f3b931e7777385f5842a2265793340e817bbf18 | |
| parent | a697dc7396f1a0cc654824a15d1a2d91a30df4ed (diff) | |
| download | manaverse-0665da9d5fe353069c418158fd9b6ecad75f0889.tar.gz manaverse-0665da9d5fe353069c418158fd9b6ecad75f0889.tar.bz2 manaverse-0665da9d5fe353069c418158fd9b6ecad75f0889.tar.xz manaverse-0665da9d5fe353069c418158fd9b6ecad75f0889.zip | |
Add another zip archive for future tests.
| -rw-r--r-- | data/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/test/Makefile.am | 1 | ||||
| -rw-r--r-- | data/test/test5.zip | bin | 0 -> 333 bytes | |||
| -rw-r--r-- | src/fs/physfs/virtfsphys_unittest.cc | 8 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfsdir_unittest.cc | 8 | ||||
| -rw-r--r-- | src/fs/virtfs_unittest.cc | 8 |
6 files changed, 14 insertions, 12 deletions
diff --git a/data/test/CMakeLists.txt b/data/test/CMakeLists.txt index 7e76a7b99..cca62955c 100644 --- a/data/test/CMakeLists.txt +++ b/data/test/CMakeLists.txt @@ -18,6 +18,7 @@ SET(FILES test2.zip test3.zip test4.zip + test5.zip testintmap.xml units.xml ) diff --git a/data/test/Makefile.am b/data/test/Makefile.am index 8288f9426..fd185e722 100644 --- a/data/test/Makefile.am +++ b/data/test/Makefile.am @@ -22,6 +22,7 @@ test_DATA = \ test2.zip \ test3.zip \ test4.zip \ + test5.zip \ testintmap.xml \ units.xml diff --git a/data/test/test5.zip b/data/test/test5.zip Binary files differnew file mode 100644 index 000000000..1f40a398c --- /dev/null +++ b/data/test/test5.zip diff --git a/src/fs/physfs/virtfsphys_unittest.cc b/src/fs/physfs/virtfsphys_unittest.cc index 7eeb01143..f35dedc7f 100644 --- a/src/fs/physfs/virtfsphys_unittest.cc +++ b/src/fs/physfs/virtfsphys_unittest.cc @@ -145,8 +145,8 @@ TEST_CASE("VirtFsPhys enumerateFiles1") VirtList *list = nullptr; - const int cnt1 = VirtFsPhys::exists("test/test2.txt") ? 27 : 26; - const int cnt2 = 27; + const int cnt1 = VirtFsPhys::exists("test/test2.txt") ? 28 : 27; + const int cnt2 = 28; VirtFsPhys::permitLinks(false); list = VirtFsPhys::enumerateFiles("test"); @@ -475,8 +475,8 @@ TEST_CASE("VirtFsPhys permitLinks") VirtFsPhys::addDirToSearchPath("data", Append_false); VirtFsPhys::addDirToSearchPath("../data", Append_false); - const int cnt1 = VirtFsPhys::exists("test/test2.txt") ? 25 : 24; - const int cnt2 = 25; + const int cnt1 = VirtFsPhys::exists("test/test2.txt") ? 26 : 25; + const int cnt2 = 26; StringVect list; VirtFsPhys::permitLinks(false); diff --git a/src/fs/virtfs/virtfsdir_unittest.cc b/src/fs/virtfs/virtfsdir_unittest.cc index 4923c105c..f195b10bd 100644 --- a/src/fs/virtfs/virtfsdir_unittest.cc +++ b/src/fs/virtfs/virtfsdir_unittest.cc @@ -425,8 +425,8 @@ TEST_CASE("VirtFsDir enumerateFiles1") VirtList *list = nullptr; - const int cnt1 = VirtFsDir::exists("test/test2.txt") ? 27 : 26; - const int cnt2 = 27; + const int cnt1 = VirtFsDir::exists("test/test2.txt") ? 28 : 27; + const int cnt2 = 28; VirtFsDir::permitLinks(false); list = VirtFsDir::enumerateFiles("test"); @@ -662,8 +662,8 @@ TEST_CASE("VirtFsDir permitLinks") Append_false, SkipError_false); - const int cnt1 = VirtFsDir::exists("test/test2.txt") ? 25 : 24; - const int cnt2 = 25; + const int cnt1 = VirtFsDir::exists("test/test2.txt") ? 26 : 25; + const int cnt2 = 26; StringVect list; VirtFsDir::permitLinks(false); diff --git a/src/fs/virtfs_unittest.cc b/src/fs/virtfs_unittest.cc index 2e9c1c31d..057f641d5 100644 --- a/src/fs/virtfs_unittest.cc +++ b/src/fs/virtfs_unittest.cc @@ -214,8 +214,8 @@ TEST_CASE("VirtFs enumerateFiles1") VirtList *list = nullptr; - const int cnt1 = VirtFs::exists("test/test2.txt") ? 27 : 26; - const int cnt2 = 27; + const int cnt1 = VirtFs::exists("test/test2.txt") ? 28 : 27; + const int cnt2 = 28; VirtFs::permitLinks(false); list = VirtFs::enumerateFiles("test"); @@ -708,8 +708,8 @@ TEST_CASE("VirtFs permitLinks") VirtFs::addDirToSearchPath("data", Append_false); VirtFs::addDirToSearchPath("../data", Append_false); - const int cnt1 = VirtFs::exists("test/test2.txt") ? 25 : 24; - const int cnt2 = 25; + const int cnt1 = VirtFs::exists("test/test2.txt") ? 26 : 25; + const int cnt2 = 26; StringVect list; VirtFs::permitLinks(false); |