diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake index 11278220a528105d2e53588c29ef320a1b399ed1..534d298c0403635856bbdb047b59cd704c62b8f3 100644 --- a/scripts/cmake/test/AddTestTester.cmake +++ b/scripts/cmake/test/AddTestTester.cmake @@ -8,6 +8,8 @@ if(VIS_FILES AND VTKJS_CONVERTER) endforeach() endif() +message(STATUS "running command checking test results: cd ${case_path} && ${TESTER_COMMAND}") + if(WIN32) execute_process( COMMAND cmd /C ${TESTER_COMMAND} diff --git a/scripts/cmake/test/AddTestWrapper.cmake b/scripts/cmake/test/AddTestWrapper.cmake index cb9a21562a85e3e0dba5d2638ca7fb0d6d0d8c32..bdfda7ffeeeb58b0605e8c13780335e14c5d616a 100644 --- a/scripts/cmake/test/AddTestWrapper.cmake +++ b/scripts/cmake/test/AddTestWrapper.cmake @@ -4,6 +4,17 @@ foreach(FILE ${FILES_TO_DELETE}) file(REMOVE ${BINARY_PATH}/${FILE}) endforeach() +# taken from https://stackoverflow.com/a/7216542 +function(JOIN VALUES GLUE OUTPUT) + string (REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}") + string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping + set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE) +endfunction() + +JOIN("${WRAPPER_ARGS}" " " WRAPPER_ARGS_STR) +JOIN("${EXECUTABLE_ARGS}" " " EXECUTABLE_ARGS_STR) + +message(STATUS "running command generating test results: cd ${case_path} && ${WRAPPER_COMMAND} ${WRAPPER_ARGS_STR} ${EXECUTABLE} ${EXECUTABLE_ARGS_STR}") execute_process( COMMAND ${WRAPPER_COMMAND} ${WRAPPER_ARGS} ${EXECUTABLE} ${EXECUTABLE_ARGS} WORKING_DIRECTORY ${case_path}