From bcae0cae29c499b83a77a392c29c091b72f56fc6 Mon Sep 17 00:00:00 2001 From: Emmanuel Promayon Date: Wed, 6 Jun 2018 21:40:23 +0200 Subject: [PATCH] FIXED run all test from the top-level repository (so that all extensions can be found) --- .../modules/macros/camitk/test/CamiTKAddIntegrationTest.cmake | 1 + .../macros/camitk/test/CamiTKTestActionStateMachine.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk/cmake/modules/macros/camitk/test/CamiTKAddIntegrationTest.cmake b/sdk/cmake/modules/macros/camitk/test/CamiTKAddIntegrationTest.cmake index 7cd4f259..0647fa01 100644 --- a/sdk/cmake/modules/macros/camitk/test/CamiTKAddIntegrationTest.cmake +++ b/sdk/cmake/modules/macros/camitk/test/CamiTKAddIntegrationTest.cmake @@ -153,6 +153,7 @@ macro(camitk_add_integration_test) -DCAMITK_TEST_OUTPUT_DIR=${CAMITK_TEST_OUTPUT_DIR} -DCAMITK_TEST_NAME=${CAMITK_INTEGRATION_TEST_NAME} -P ${CAMITK_CMAKE_MACRO_PATH}/CamiTKTestActionStateMachine.cmake + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} # needs to be at the top of the CamiTK module repository ) diff --git a/sdk/cmake/modules/macros/camitk/test/CamiTKTestActionStateMachine.cmake b/sdk/cmake/modules/macros/camitk/test/CamiTKTestActionStateMachine.cmake index b1fad2a6..62338c9e 100644 --- a/sdk/cmake/modules/macros/camitk/test/CamiTKTestActionStateMachine.cmake +++ b/sdk/cmake/modules/macros/camitk/test/CamiTKTestActionStateMachine.cmake @@ -62,6 +62,7 @@ execute_process( COMMAND ${CAMITK_TEST_COMMAND} ${CAMITK_TEST_COMMAND_ARG_LIST} RESULT_VARIABLE CAMITK_TEST_COMMAND_RESULT OUTPUT_VARIABLE CAMITK_TEST_COMMAND_OUTPUT + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) file(WRITE ${CAMITK_TEST_COMMAND_RESULT_FILE} ${CAMITK_TEST_COMMAND_RESULT}) file(WRITE ${CAMITK_TEST_COMMAND_OUTPUT_FILE} ${CAMITK_TEST_COMMAND_OUTPUT}) -- GitLab