Test working directory set to the binary output directory in order to

find copied test configuration files

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index edec379078e7d63598b2912b8410aefb300f99cb..3de95852f47c997a3d398141975d5bd642fbb780 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -13,5 +13,5 @@ add_library(${TEST_COMMON} OBJECT ${SOURCES})
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test-hdr)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unit)
 
-file(GLOB  CONF_FILES data/*.conf)
+file(GLOB CONF_FILES ${PROJECT_SOURCE_DIR}/tests/data/*.conf)
 file(COPY ${CONF_FILES} DESTINATION ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/tests/test-hdr/CMakeLists.txt b/tests/test-hdr/CMakeLists.txt
index c93157a1de5aaeb4789e846aa2ad2c04005100aa..7e41be48c79b06bafc2e9c5e58d5eaf475504328 100644 (file)
--- a/tests/test-hdr/CMakeLists.txt
+++ b/tests/test-hdr/CMakeLists.txt
@@ -414,4 +414,4 @@ set(CDS_TESTHDR_SOURCES
 \r
 add_executable(${PACKAGE_NAME} ${CDS_TESTHDR_SOURCES} $<TARGET_OBJECTS:test-hdr-offsetof> $<TARGET_OBJECTS:${TEST_COMMON}>)\r
 target_link_libraries(${PACKAGE_NAME} ${CDS_SHARED_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})\r
-add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME})
\ No newline at end of file
+add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index ffd672dd5925947d62491fb30a7e0815c0f0d2dd..1d3063c733908443dbba34a0e584f162d17f0a78 100644 (file)
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CDSUNIT_MISC_SOURCES
 
 add_executable(${PACKAGE_NAME} ${CDSUNIT_MAP_SOURCES} $<TARGET_OBJECTS:${TEST_COMMON}>)
 target_link_libraries(${PACKAGE_NAME} ${CDS_SHARED_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME})
+add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/map2)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/pqueue)

diff --git a/tests/unit/map2/CMakeLists.txt b/tests/unit/map2/CMakeLists.txt
index 0637900ee732213ca997474293fdeb9b19c5fa89..1a55ab844fc0c06ecb52cb6c05f02f51364d1b99 100644 (file)
--- a/tests/unit/map2/CMakeLists.txt
+++ b/tests/unit/map2/CMakeLists.txt
@@ -100,4 +100,4 @@ set(CDSUNIT_MAP_SOURCES
 
 add_executable(${PACKAGE_NAME} ${CDSUNIT_MAP_SOURCES} $<TARGET_OBJECTS:${TEST_COMMON}>)
 target_link_libraries(${PACKAGE_NAME} ${CDS_SHARED_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME})
\ No newline at end of file
+add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/tests/unit/pqueue/CMakeLists.txt b/tests/unit/pqueue/CMakeLists.txt
index d89a966a6199320b27536f72b8243d0ef70da0a2..ae2a6d8b82f39ac27d3d24afdb6087f333ac227d 100644 (file)
--- a/tests/unit/pqueue/CMakeLists.txt
+++ b/tests/unit/pqueue/CMakeLists.txt
@@ -7,4 +7,4 @@ set(CDSUNIT_PQUEUE_SOURCES
 
 add_executable(${PACKAGE_NAME} ${CDSUNIT_PQUEUE_SOURCES} $<TARGET_OBJECTS:${TEST_COMMON}>)
 target_link_libraries(${PACKAGE_NAME} ${CDS_SHARED_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME})
\ No newline at end of file
+add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/tests/unit/queue/CMakeLists.txt b/tests/unit/queue/CMakeLists.txt
index b32e7123fc7d743405e0b3132728b8e92cb78bf8..f41f29cf3463c81c2e3e09933e2b7f4a09ffc561 100644 (file)
--- a/tests/unit/queue/CMakeLists.txt
+++ b/tests/unit/queue/CMakeLists.txt
@@ -10,4 +10,4 @@ set(CDSUNIT_QUEUE_SOURCES
 
 add_executable(${PACKAGE_NAME} ${CDSUNIT_QUEUE_SOURCES} $<TARGET_OBJECTS:${TEST_COMMON}>)
 target_link_libraries(${PACKAGE_NAME} ${CDS_SHARED_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME})
\ No newline at end of file
+add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/tests/unit/set2/CMakeLists.txt b/tests/unit/set2/CMakeLists.txt
index 89e71cf1352fc6f532aa9bc51f5b5d73a2530e39..4431cdd3b6b1b5edf7f8fcfc8d6f9522686aec1a 100644 (file)
--- a/tests/unit/set2/CMakeLists.txt
+++ b/tests/unit/set2/CMakeLists.txt
@@ -38,4 +38,4 @@ set(CDSUNIT_SET_SOURCES
 
 add_executable(${PACKAGE_NAME} ${CDSUNIT_SET_SOURCES} $<TARGET_OBJECTS:${TEST_COMMON}>)
 target_link_libraries(${PACKAGE_NAME} ${CDS_SHARED_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME})
\ No newline at end of file
+add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/tests/unit/stack/CMakeLists.txt b/tests/unit/stack/CMakeLists.txt
index f521144c614330c264d963339178da1dd9fa957a..ea341729682153b1004c8f1b882da2c096df83b3 100644 (file)
--- a/tests/unit/stack/CMakeLists.txt
+++ b/tests/unit/stack/CMakeLists.txt
@@ -7,4 +7,4 @@ set(CDSUNIT_STACK_SOURCES
 
 add_executable(${PACKAGE_NAME} ${CDSUNIT_STACK_SOURCES} $<TARGET_OBJECTS:${TEST_COMMON}>)
 target_link_libraries(${PACKAGE_NAME} ${CDS_SHARED_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME})
\ No newline at end of file
+add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file