diff options
| author | Saya Sugiura <ssugiura@jp.adit-jv.com> | 2021-08-02 14:55:01 +0900 |
|---|---|---|
| committer | Saya Sugiura <ssugiura@jp.adit-jv.com> | 2021-10-05 11:07:37 +0900 |
| commit | 50950f2637f45e5854fef19948d468507b1725ae (patch) | |
| tree | d0c6d57ac2805d72a5c117637df65eca0dc42930 | |
| parent | 34e7b114cc75ec94f06a5eb6c7548aec0dec4384 (diff) | |
| download | DLT-daemon-50950f2637f45e5854fef19948d468507b1725ae.tar.gz | |
gtest: Rework WORKING_DIRECTORY
testfile.dlt was not detected correctly with ctest, so corrected
WORKING_DIRECTORY accordingly.
Signed-off-by: Saya Sugiura <ssugiura@jp.adit-jv.com>
| -rw-r--r-- | tests/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 37de4cb..ccf6e03 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -42,8 +42,7 @@ foreach(target IN LISTS TARGET_LIST) add_executable(${target} ${target_SRCS}) target_link_libraries(${target} ${DLT_LIBRARIES}) add_test(NAME ${target} - COMMAND ${target} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + COMMAND ${target}) endforeach() ################### @@ -65,13 +64,12 @@ foreach(target IN LISTS TARGET_LIST) if(${target} STREQUAL "gtest_dlt_daemon_event_handler" OR ${target} STREQUAL "gtest_dlt_shm") add_test(NAME ${target} - COMMAND ${target} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + COMMAND ${target}) else() + configure_file(${PROJECT_SOURCE_DIR}/tests/${target}.sh ${PROJECT_BINARY_DIR}/tests COPYONLY) add_test(NAME ${target} COMMAND /bin/sh "${target}.sh" - ${target} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + ${target}) endif() endforeach() @@ -84,7 +82,6 @@ if(WITH_EXTENDED_FILTERING) add_executable(gtest_dlt_json_filter gtest_dlt_json_filter.cpp) target_link_libraries(gtest_dlt_json_filter ${DLT_CONTROL_LIBRARIES}) add_test(NAME gtest_dlt_json_filter - COMMAND gtest_dlt_json_filter - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + COMMAND gtest_dlt_json_filter) endif() |