diff options
| -rw-r--r-- | cmake/modules/AddCMockaTest.cmake | 3 | ||||
| -rw-r--r-- | test/csync/CMakeLists.txt | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/cmake/modules/AddCMockaTest.cmake b/cmake/modules/AddCMockaTest.cmake index 1c0bc04f6..df5af0a79 100644 --- a/cmake/modules/AddCMockaTest.cmake +++ b/cmake/modules/AddCMockaTest.cmake @@ -18,7 +18,8 @@ endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW) function (ADD_CMOCKA_TEST _testName _testSource) add_executable(${_testName} ${_testSource}) + set_target_properties(${_testName} PROPERTIES C_STANDARD 99) ecm_mark_nongui_executable(${_testName}) target_link_libraries(${_testName} ${ARGN}) - add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}) + add_test(NAME ${_testName} COMMAND $<TARGET_FILE:${_testName}>) endfunction (ADD_CMOCKA_TEST) diff --git a/test/csync/CMakeLists.txt b/test/csync/CMakeLists.txt index 7b41a8f10..9a29476ee 100644 --- a/test/csync/CMakeLists.txt +++ b/test/csync/CMakeLists.txt @@ -15,27 +15,19 @@ set(TEST_TARGET_LIBRARIES torture Qt5::Core "${csync_NAME}") # create tests -#cmocka does not provide the full path to the test... -unset(CMAKE_RUNTIME_OUTPUT_DIRECTORY) - # std add_cmocka_test(check_std_c_alloc std_tests/check_std_c_alloc.c ${TEST_TARGET_LIBRARIES}) -set_target_properties(check_std_c_alloc PROPERTIES C_STANDARD 99) add_cmocka_test(check_std_c_jhash std_tests/check_std_c_jhash.c ${TEST_TARGET_LIBRARIES}) -set_target_properties(check_std_c_jhash PROPERTIES C_STANDARD 99) add_cmocka_test(check_std_c_str std_tests/check_std_c_str.c ${TEST_TARGET_LIBRARIES}) -set_target_properties(check_std_c_str PROPERTIES C_STANDARD 99) # vio if (NOT WIN32) # TODO: char* vs wchar_t add_cmocka_test(check_vio_ext vio_tests/check_vio_ext.cpp ${TEST_TARGET_LIBRARIES}) - set_target_properties(check_vio_ext PROPERTIES C_STANDARD 99) endif() # encoding add_cmocka_test(check_encoding_functions encoding_tests/check_encoding.cpp ${TEST_TARGET_LIBRARIES}) -set_target_properties(check_encoding_functions PROPERTIES C_STANDARD 99) |