diff --git a/scripts/cmake/test/AddTestWrapper.cmake b/scripts/cmake/test/AddTestWrapper.cmake index bdfda7ffeeeb58b0605e8c13780335e14c5d616a..b2f6b78db6fee3cb7f6485a26f4301d4589dc9c0 100644 --- a/scripts/cmake/test/AddTestWrapper.cmake +++ b/scripts/cmake/test/AddTestWrapper.cmake @@ -4,17 +4,7 @@ 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}") +message(STATUS "running command generating test results: ${WRAPPER_COMMAND} ${WRAPPER_ARGS} ${EXECUTABLE} ${EXECUTABLE_ARGS}") execute_process( COMMAND ${WRAPPER_COMMAND} ${WRAPPER_ARGS} ${EXECUTABLE} ${EXECUTABLE_ARGS} WORKING_DIRECTORY ${case_path}