diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-02 05:18:37 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-02 05:18:37 +0300 |
| commit | 22a2c48a263c67ab3418c22a88cec67e5c1d318c (patch) | |
| tree | 5e1685b0ec799dcaf52dd87bafbdafe7421943f9 /src/resources | |
| parent | 4b1ca08f26152fbcfb5eb838d271fdd88c381eca (diff) | |
| download | manaverse-22a2c48a263c67ab3418c22a88cec67e5c1d318c.tar.gz manaverse-22a2c48a263c67ab3418c22a88cec67e5c1d318c.tar.bz2 manaverse-22a2c48a263c67ab3418c22a88cec67e5c1d318c.tar.xz manaverse-22a2c48a263c67ab3418c22a88cec67e5c1d318c.zip | |
Fix tests failure in physfs deinit.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/dye/dye_unittest.cc | 2 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_unittest.cc | 2 | ||||
| -rw-r--r-- | src/resources/map/speciallayer_unittest.cc | 2 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager_unittest.cc | 2 | ||||
| -rw-r--r-- | src/resources/sprite/animatedsprite_unittest.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc index cc368d865..6b2e01e60 100644 --- a/src/resources/dye/dye_unittest.cc +++ b/src/resources/dye/dye_unittest.cc @@ -2393,11 +2393,11 @@ TEST_CASE("Dye real dye") { dyeCheck("|A:#0000FFFF,FF000050", "arrow_up_A.png"); } - delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); VirtFs::removeDirFromSearchPath("data/test"); VirtFs::removeDirFromSearchPath("../data/test"); + delete2(client); delete2(logger); // VirtFs::deinit(); } diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index 7df69e952..3fdcfb1ff 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -383,11 +383,11 @@ TEST_CASE("DyePalette tests") REQUIRE(palette.mColors[0].value[2] == 46); REQUIRE(palette.mColors[0].value[3] == 0x77); } - delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); VirtFs::removeDirFromSearchPath("data/test"); VirtFs::removeDirFromSearchPath("../data/test"); + delete2(client); delete2(logger); // VirtFs::deinit(); } diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc index 223d05b4e..a38adbd96 100644 --- a/src/resources/map/speciallayer_unittest.cc +++ b/src/resources/map/speciallayer_unittest.cc @@ -261,8 +261,8 @@ TEST_CASE("SpecialLayer updateCache") delete layer; resourceManager->cleanOrphans(); - delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); + delete2(client); delete2(logger); } diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc index fa0a07b76..ec3ac01d1 100644 --- a/src/resources/resourcemanager/resourcemanager_unittest.cc +++ b/src/resources/resourcemanager/resourcemanager_unittest.cc @@ -659,9 +659,9 @@ TEST_CASE("resourcemanager", "resourcemanager") delete resourceManager; resourceManager = safeResman; - delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); + delete2(client); delete2(logger); // VirtFs::deinit(); } diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index 85a1c3e87..604ae264f 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -181,9 +181,9 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite") delete sprite2; } - delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); + delete2(client); delete2(logger); // VirtFs::deinit(); } |