diff --git a/Jenkinsfile b/Jenkinsfile index d3e3f4d98431ada32f982e50eed1b2a247b46d4f..51e5b7b52da07b9f9baad13556be91a6024472d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -407,7 +407,6 @@ pipeline { steps { script { configure { } - build { } build { target = 'ctest-large-serial' } } } diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake index a77b14252786d15890ed976e13040a13cb5f775b..2059f0f3743f27ba4f4fe1fa844420553571a964 100644 --- a/scripts/cmake/test/AddTestTester.cmake +++ b/scripts/cmake/test/AddTestTester.cmake @@ -36,6 +36,7 @@ foreach(CMD ${TESTER_COMMAND}) WORKING_DIRECTORY ${case_path} RESULT_VARIABLE EXIT_CODE OUTPUT_VARIABLE OUTPUT + ERROR_VARIABLE OUTPUT ) if(NOT EXIT_CODE STREQUAL "0") @@ -48,9 +49,10 @@ foreach(CMD ${TESTER_COMMAND}) WORKING_DIRECTORY ${case_path} RESULT_VARIABLE EXIT_CODE OUTPUT_VARIABLE OUTPUT + ERROR_VARIABLE OUTPUT ) if(NOT EXIT_CODE STREQUAL "0") - message(FATAL_ERROR "Error exit code: ${EXIT_CODE}") + message(FATAL_ERROR "Error exit code: ${EXIT_CODE}${OUTPUT}") endif() endif() endforeach() diff --git a/scripts/cmake/test/AddTestWrapper.cmake b/scripts/cmake/test/AddTestWrapper.cmake index 47cd6ac6f13a3d9657c2895b059617455dddae39..7c7f4098d4beaeeef2be9e1fca39e65881cc8b99 100644 --- a/scripts/cmake/test/AddTestWrapper.cmake +++ b/scripts/cmake/test/AddTestWrapper.cmake @@ -21,9 +21,11 @@ execute_process( COMMAND ${WRAPPER_COMMAND} ${WRAPPER_ARGS} ${EXECUTABLE} ${EXECUTABLE_ARGS} WORKING_DIRECTORY ${case_path} RESULT_VARIABLE EXIT_CODE - OUTPUT_FILE ${STDOUT_FILE_PATH} + # OUTPUT_FILE ${STDOUT_FILE_PATH} # must be used exclusively + OUTPUT_VARIABLE OUTPUT + ERROR_VARIABLE OUTPUT ) if(NOT EXIT_CODE STREQUAL "0") - message(FATAL_ERROR "Test wrapper exited with code: ${EXIT_CODE}") + message(FATAL_ERROR "Test wrapper exited with code: ${EXIT_CODE}\n${OUTPUT}") endif()