From fbede6225effcd5d0d038091ba12e6a131546887 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 4 Feb 2016 18:17:49 -0500 Subject: [PATCH] handle empty test output If the make command to compile a test returns empty output (don't ask me why that happened on my machine), quote it in the regex to avoid an error like: "string sub-command REGEX, mode MATCH needs at least 5 arguments" --- cmake/scripts/run_test.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/scripts/run_test.cmake b/cmake/scripts/run_test.cmake index a95795e7e1..78f813901d 100644 --- a/cmake/scripts/run_test.cmake +++ b/cmake/scripts/run_test.cmake @@ -64,11 +64,11 @@ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} # (Possible values are CONFIGURE, BUILD, RUN, DIFF, PASSED) # -STRING(REGEX MATCH "${TEST}: CONFIGURE failed\\." _configure_regex ${_output}) -STRING(REGEX MATCH "${TEST}: BUILD failed\\." _build_regex ${_output}) -STRING(REGEX MATCH "${TEST}: RUN failed\\." _run_regex ${_output}) -STRING(REGEX MATCH "${TEST}: DIFF failed\\." _diff_regex ${_output}) -STRING(REGEX MATCH "${TEST}: PASSED\\." _passed_regex ${_output}) +STRING(REGEX MATCH "${TEST}: CONFIGURE failed\\." _configure_regex "${_output}") +STRING(REGEX MATCH "${TEST}: BUILD failed\\." _build_regex "${_output}") +STRING(REGEX MATCH "${TEST}: RUN failed\\." _run_regex "${_output}") +STRING(REGEX MATCH "${TEST}: DIFF failed\\." _diff_regex "${_output}") +STRING(REGEX MATCH "${TEST}: PASSED\\." _passed_regex "${_output}") IF(NOT "${_passed_regex}" STREQUAL "") SET(_stage PASSED) @@ -115,7 +115,7 @@ ELSE() # Some special output in case the BUILD stage failed in a regression test: MESSAGE("${TEST}: BUILD failed. Output:") ENDIF() - MESSAGE(${_output}) + MESSAGE("${_output}") MESSAGE("") MESSAGE("${TEST}: ****** ${_stage} failed *******") MESSAGE("") -- 2.39.5