diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-02 16:54:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-02 16:54:06 +0300 |
| commit | 40b35b5a049187c1911075c474086251d639d127 (patch) | |
| tree | c3c3dc430d9ae2017b85f4c6ca835f2e432c0d9d /src/utils | |
| parent | db08f7874bd9be0e461b296569613364353d4eaf (diff) | |
| download | manaplus-40b35b5a049187c1911075c474086251d639d127.tar.gz manaplus-40b35b5a049187c1911075c474086251d639d127.tar.bz2 manaplus-40b35b5a049187c1911075c474086251d639d127.tar.xz manaplus-40b35b5a049187c1911075c474086251d639d127.zip | |
Revert "Fix tests failure in physfs deinit."
This reverts commit 22a2c48a263c67ab3418c22a88cec67e5c1d318c.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/chatutils_unittest.cc | 2 | ||||
| -rw-r--r-- | src/utils/translation/poparser_unittest.cc | 2 | ||||
| -rw-r--r-- | src/utils/xml_unittest.cc | 3 | ||||
| -rw-r--r-- | src/utils/xmlutils_unittest.cc | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index 9f1188bd0..421798227 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -237,9 +237,9 @@ TEST_CASE("chatutils replaceVars") delete2(actorManager); delete2(localPlayer); + delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); - delete2(client); delete2(logger); // VirtFs::deinit(); } diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc index 77d958885..9182bebbc 100644 --- a/src/utils/translation/poparser_unittest.cc +++ b/src/utils/translation/poparser_unittest.cc @@ -122,9 +122,9 @@ TEST_CASE("PoParser tests", "PoParser") delete parser; delete dict; } + delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); - delete2(client); delete2(logger); // VirtFs::deinit(); } diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc index 3dbda4a1c..f5211bcb5 100644 --- a/src/utils/xml_unittest.cc +++ b/src/utils/xml_unittest.cc @@ -358,9 +358,10 @@ TEST_CASE("xml doc") ::remove(tempXmlName); } delete2(theme); + delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); - delete2(client); + delete2(logger); // VirtFs::deinit(); } diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc index 4575854b4..dff0b130c 100644 --- a/src/utils/xmlutils_unittest.cc +++ b/src/utils/xmlutils_unittest.cc @@ -77,10 +77,10 @@ TEST_CASE("xmlutils readXmlIntVector 1") REQUIRE(0 == arr[2]); REQUIRE(1 == arr[3]); REQUIRE(1 == arr[4]); + delete2(client); ResourceManager::deleteInstance(); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); - delete2(client); delete2(logger); // VirtFs::deinit(); } @@ -123,10 +123,10 @@ TEST_CASE("xmlutils readXmlStringMap 1") REQUIRE(arr["Kitty"] == "0"); REQUIRE(arr["xD"] == "1"); REQUIRE(arr["Metal"] == "26"); + delete2(client); ResourceManager::deleteInstance(); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); - delete2(client); delete2(logger); // VirtFs::deinit(); } @@ -171,12 +171,12 @@ TEST_CASE("xmlutils readXmlIntMap 1") REQUIRE(arr[1] == 2); REQUIRE(arr[10] == 20); REQUIRE(arr[3] == 0); + delete2(client); ResourceManager::deleteInstance(); VirtFs::removeDirFromSearchPath("data/test"); VirtFs::removeDirFromSearchPath("../data/test"); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); - delete2(client); delete2(logger); // VirtFs::deinit(); } |