diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | mmc_updater/src/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 11 |
3 files changed, 6 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index be0eced8..8ea5803d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ IF(WIN32) ENDIF() project(MultiMC) +enable_testing() ######## Set CMake options ######## SET(CMAKE_AUTOMOC ON) diff --git a/mmc_updater/src/tests/CMakeLists.txt b/mmc_updater/src/tests/CMakeLists.txt index 2af9b9c0..5de9d096 100644 --- a/mmc_updater/src/tests/CMakeLists.txt +++ b/mmc_updater/src/tests/CMakeLists.txt @@ -34,7 +34,7 @@ macro(ADD_UPDATER_TEST CLASS) set(TEST_TARGET updater_${CLASS}) add_executable(${TEST_TARGET} ${CLASS}.cpp) target_link_libraries(${TEST_TARGET} updatershared) - add_test(${TEST_TARGET} ${TEST_TARGET}) + add_test(NAME ${TEST_TARGET} COMMAND ${TEST_TARGET}) if (APPLE) set_target_properties(${TEST_TARGET} PROPERTIES LINK_FLAGS "-framework Security -framework Cocoa") endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 20863c73..e115af17 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,3 +1,4 @@ +# run the unit tests with `make test` find_package(Qt5 COMPONENTS Test Core Network Widgets) include_directories(${MMC_SRC}) @@ -11,18 +12,14 @@ macro(add_unit_test name) add_executable(tst_${name} ${srcs}) qt5_use_modules(tst_${name} Test Core Network Widgets) target_link_libraries(tst_${name} MultiMC_common) - add_test(tst_${name} tst_${name}) list(APPEND MultiMC_TESTS tst_${name}) -endmacro() - -macro(add_unit_test2 name) - add_unit_test(${name} tst_${name}.cpp) + add_test(NAME ${name} COMMAND tst_${name}) endmacro() # Tests START # -add_unit_test2(pathutils) -add_unit_test2(userutils) +add_unit_test(pathutils tst_pathutils.cpp) +add_unit_test(userutils tst_userutils.cpp) # Tests END # |