Browse Source

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.
Matthew Woehlke 8 years ago
parent
commit
e99e39829b
1 changed files with 7 additions and 3 deletions
  1. 7 3
      Modules/GoogleTestAddTests.cmake

+ 7 - 3
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()