diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-26 21:08:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-26 22:43:41 +0300 |
| commit | e4196b3c4911bf021ec5da2bd65ff8ca0c66e7e7 (patch) | |
| tree | 223f9b5f9ec1299125e59da65cc62ea85ab915b2 /src/Makefile.am | |
| parent | 055345145f35286b3f45ed05d5a80d118a1ab8f4 (diff) | |
| download | manaverse-e4196b3c4911bf021ec5da2bd65ff8ca0c66e7e7.tar.gz manaverse-e4196b3c4911bf021ec5da2bd65ff8ca0c66e7e7.tar.bz2 manaverse-e4196b3c4911bf021ec5da2bd65ff8ca0c66e7e7.tar.xz manaverse-e4196b3c4911bf021ec5da2bd65ff8ca0c66e7e7.zip | |
Replace gtest with catch. Add basic support for catch.
Also add make script for tests.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b9847ae95..2c706b0d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -965,6 +965,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ beingequipbackend.h \ spellmanager.cpp \ spellmanager.h \ + catch.hpp \ chatlogger.cpp \ chatlogger.h \ client.cpp \ @@ -1509,16 +1510,20 @@ manaplus_SOURCES += \ mumblemanager.h if ENABLE_UNITTESTS -manaplus_CXXFLAGS += -DUNITTESTS -manaplus_SOURCES += \ - animatedsprite_unittest.cc \ - gui/fonts/font_unittest.cc \ - gui/widgets/browserbox_unittest.cc \ - utils/files_unittest.cc \ - utils/stringutils_unittest.cc \ - utils/xmlutils_unittest.cc \ - resources/dye_unittest.cc \ - resources/mstack_unittest.cc +TESTS = manaplustests +check_PROGRAMS = manaplustests +manaplustests_CXXFLAGS = ${manaplus_CXXFLAGS} \ + -DUNITTESTS +manaplustests_SOURCES = ${manaplus_SOURCES} +#manaplustests_SOURCES = ${manaplus_SOURCES} \ +# animatedsprite_unittest.cc \ +# gui/fonts/font_unittest.cc \ +# gui/widgets/browserbox_unittest.cc \ +# utils/files_unittest.cc \ +# utils/stringutils_unittest.cc \ +# utils/xmlutils_unittest.cc \ +# resources/dye_unittest.cc \ +# resources/mstack_unittest.cc endif EXTRA_DIST = CMakeLists.txt \ |