diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-11 21:53:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-11 21:53:04 +0300 |
| commit | 8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471 (patch) | |
| tree | 35334434f931a50df1232771b49d54b04179193e /src | |
| parent | 71485eae058bab256770e90e5de196b3baf01cea (diff) | |
| download | manaverse-8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471.tar.gz manaverse-8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471.tar.bz2 manaverse-8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471.tar.xz manaverse-8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471.zip | |
Move doctest and catch files into unittests directory.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/maingui.cpp | 4 | ||||
| -rw-r--r-- | src/unittests/catch.hpp (renamed from src/test/catch.hpp) | 0 | ||||
| -rw-r--r-- | src/unittests/doctest.h (renamed from src/test/doctest.h) | 0 | ||||
| -rw-r--r-- | src/unittests/unittests.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b389ffc8f..14e4b875c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2021,11 +2021,11 @@ manaplustests_SOURCES = \ if ENABLE_UNITTESTS_CATCH manaplustests_SOURCES += \ - test/catch.hpp + unittests/catch.hpp endif if ENABLE_UNITTESTS_DOCTEST manaplustests_SOURCES += \ - test/doctest.h + unittests/doctest.h endif if MINGW diff --git a/src/maingui.cpp b/src/maingui.cpp index 235d34df8..9e7efa9c6 100644 --- a/src/maingui.cpp +++ b/src/maingui.cpp @@ -56,11 +56,11 @@ PRAGMA48(GCC diagnostic pop) #include "resources/dye/dyepalette.h" #ifdef UNITTESTS_CATCH #define CATCH_CONFIG_RUNNER -#include "test/catch.hpp" +#include "unittests/catch.hpp" #endif // UNITTESTS_CATCH #ifdef UNITTESTS_DOCTEST #define DOCTEST_CONFIG_IMPLEMENT -#include "test/doctest.h" +#include "unittests/doctest.h" #endif // UNITTESTS_DOCTEST #else // UNITTESTS #include "utils/xml.h" diff --git a/src/test/catch.hpp b/src/unittests/catch.hpp index 64d1cafc4..64d1cafc4 100644 --- a/src/test/catch.hpp +++ b/src/unittests/catch.hpp diff --git a/src/test/doctest.h b/src/unittests/doctest.h index 695c271b5..695c271b5 100644 --- a/src/test/doctest.h +++ b/src/unittests/doctest.h diff --git a/src/unittests/unittests.h b/src/unittests/unittests.h index 13be1b9c0..a83a0a198 100644 --- a/src/unittests/unittests.h +++ b/src/unittests/unittests.h @@ -24,7 +24,7 @@ #include "localconsts.h" #ifdef UNITTESTS_CATCH -#include "test/catch.hpp" +#include "unittests/catch.hpp" #endif // UNITTESTS_CATCH #ifdef UNITTESTS_DOCTEST @@ -41,7 +41,7 @@ PRAGMA5(GCC diagnostic push) PRAGMA5(GCC diagnostic ignored "-Wsuggest-override") -#include "test/doctest.h" +#include "unittests/doctest.h" PRAGMA5(GCC diagnostic pop) #undef TEST_CASE |