From 04548c820a54d2d97ce33f3656c22a08b9ba09aa Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 14:32:40 +0100 Subject: [PATCH] fix unit tests --- CMakeLists.txt | 17 ----------------- unitTests/wavelibBoostTests/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e77e2ae..a5c7a16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,23 +53,6 @@ if(BUILD_UT) include(CTest) enable_testing() add_subdirectory(unitTests) - - add_custom_target(CopyDataFiles - - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/signal.txt ${COMMON_BIN_PATH}/Debug - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/signal.txt ${COMMON_BIN_PATH}/Release - - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x1.txt ${COMMON_BIN_PATH}/Debug - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x1.txt ${COMMON_BIN_PATH}/Release - - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x2.txt ${COMMON_BIN_PATH}/Debug - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x2.txt ${COMMON_BIN_PATH}/Release - - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/s1.txt ${COMMON_BIN_PATH}/Debug - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/s1.txt ${COMMON_BIN_PATH}/Release - ) - - add_dependencies(wavelibLibTests CopyDataFiles) endif() add_subdirectory(src) diff --git a/unitTests/wavelibBoostTests/CMakeLists.txt b/unitTests/wavelibBoostTests/CMakeLists.txt index 53e68f0..5eef325 100644 --- a/unitTests/wavelibBoostTests/CMakeLists.txt +++ b/unitTests/wavelibBoostTests/CMakeLists.txt @@ -14,7 +14,7 @@ set(HEADER_FILES add_executable(wavelibLibTests ${SOURCE_FILES} ${HEADER_FILES}) -add_test(NAME wavelibTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND wavelibTests) +add_test(NAME wavelibLibTests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test COMMAND wavelibLibTests) include_directories(${BOOST_DIR}) add_dependencies(wavelibLibTests wavelib)