From e99e39829ba36dbfad189a94062363343d7d3d8b Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Thu, 30 Nov 2017 14:18:56 -0500 Subject: GoogleTest: Improve gtest_discover_tests messages Adjust the formatting of error messages produced when test discovery goes wrong, in order to avoid spurious line breaking. --- Modules/GoogleTestAddTests.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake index 7d0d909..6424d56 100644 --- a/Modules/GoogleTestAddTests.cmake +++ b/Modules/GoogleTestAddTests.cmake @@ -24,7 +24,8 @@ endfunction() # Run test executable to get list of available tests if(NOT EXISTS "${TEST_EXECUTABLE}") message(FATAL_ERROR - "Specified test executable '${TEST_EXECUTABLE}' does not exist" + "Specified test executable does not exist.\n" + " Path: '${TEST_EXECUTABLE}'" ) endif() execute_process( @@ -33,10 +34,13 @@ execute_process( RESULT_VARIABLE result ) if(NOT ${result} EQUAL 0) + string(REPLACE "\n" "\n " output "${output}") message(FATAL_ERROR - "Error running test executable '${TEST_EXECUTABLE}':\n" + "Error running test executable.\n" + " Path: '${TEST_EXECUTABLE}'\n" " Result: ${result}\n" - " Output: ${output}\n" + " Output:\n" + " ${output}\n" ) endif() -- cgit v0.12