Skip to content
Snippets Groups Projects
Commit 43b890f9 authored by Lars Bilke's avatar Lars Bilke
Browse files

[CTest] Split test tester into multiple command runs.

parent 85498d0e
No related branches found
No related tags found
No related merge requests found
......@@ -189,9 +189,6 @@ Use six arguments version of AddTest with absolute and relative tolerances")
else ()
message(FATAL_ERROR "For vtkdiff tester the number of diff data arguments must be a multiple of six.")
endif()
string(REPLACE ";" " && " TESTER_COMMAND "${TESTER_COMMAND}")
elseif(tester STREQUAL "memcheck")
set(TESTER_COMMAND "! ${GREP_TOOL_PATH} definitely ${AddTest_SOURCE_PATH}/${AddTest_NAME}_memcheck.log")
endif()
......
......@@ -11,20 +11,20 @@ endif()
message(STATUS "running command checking test results: cd ${case_path} && ${TESTER_COMMAND}")
if(WIN32)
execute_process(
COMMAND cmd /C ${TESTER_COMMAND}
WORKING_DIRECTORY ${case_path}
RESULT_VARIABLE EXIT_CODE
OUTPUT_VARIABLE OUTPUT
)
set(TERMINAL_CMD cmd /C)
else()
execute_process(
COMMAND bash -c ${TESTER_COMMAND}
WORKING_DIRECTORY ${case_path}
RESULT_VARIABLE EXIT_CODE
OUTPUT_VARIABLE OUTPUT
)
set(TERMINAL_CMD bash -c)
endif()
foreach(CMD ${TESTER_COMMAND})
set(COMBINED_COMMAND ${COMBINED_COMMAND} COMMAND ${TERMINAL_CMD} ${CMD})
endforeach()
execute_process(
${COMBINED_COMMAND}
WORKING_DIRECTORY ${case_path}
RESULT_VARIABLE EXIT_CODE
OUTPUT_VARIABLE OUTPUT
)
if(NOT EXIT_CODE STREQUAL "0")
message(FATAL_ERROR "Error exit code: ${EXIT_CODE}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment