DONT MERGE

Author: threeal

cmake/Assertion.cmake

@@ -31,14 +31,24 @@ endfunction()
 macro(fail FIRST_LINE)
   set(MESSAGE "${FIRST_LINE}")
 
+  unset(PREV_LINE_IS_MULTI_LINE)
   foreach(LINE IN ITEMS ${ARGN})
     if(DEFINED "${LINE}")
-      string(REPLACE "\n" "\n  " LINE "${${LINE}}")
-      string(APPEND MESSAGE ":\n  ${LINE}")
+      if("${${LINE}}" MATCHES "\n")
+        string(REPLACE "\n" "\n  " LINE "${${LINE}}")
+        string(APPEND MESSAGE ":\n  ${LINE}")
+      else()
+        string(APPEND MESSAGE " '${${LINE}}'")
+      endif()
     else()
-      string(APPEND MESSAGE "\n${LINE}")
+      if(PREV_LINE_IS_MULTI_LINE)
+        string(APPEND MESSAGE "\n${LINE}")
+      else()
+        string(APPEND MESSAGE " ${LINE}")
+      endif()
     endif()
   endforeach()
+  unset(PREV_LINE_IS_MULTI_LINE)
 
   message(FATAL_ERROR "${MESSAGE}")
 endmacro()

test/AssertExecuteProcess.cmake

@@ -8,14 +8,12 @@ section("execute process assertions")
 
   assert_fatal_error(
     CALL assert_execute_process "${CMAKE_COMMAND}" -E true ERROR .*
-    MESSAGE "expected command:\n  ${CMAKE_COMMAND} -E true\nto fail")
+    MESSAGE "expected command '${CMAKE_COMMAND} -E true' to fail")
 
   assert_fatal_error(
     CALL assert_execute_process "${CMAKE_COMMAND}" -E make_directory some-file
-    MESSAGE "expected command:\n"
-      "  ${CMAKE_COMMAND} -E make_directory some-file\n"
-      "not to fail with error:\n"
-      "  Error creating directory \"some-file\".")
+    MESSAGE "expected command '${CMAKE_COMMAND} -E make_directory some-file' "
+      "not to fail with error 'Error creating directory \"some-file\".'")
 endsection()
 
 section("execute process output assertions")

test/Fail.cmake

@@ -8,8 +8,8 @@ section("it should fail with a formatted fatal error message")
     MESSAGE "something happened\non multiple lines")
 
   assert_fatal_error(
-    CALL fail "something happened" "on multiple lines"
-    MESSAGE "something happened\non multiple lines")
+    CALL fail "something happened" "not on multiple lines"
+    MESSAGE "something happened not on multiple lines")
 endsection()
 
 section("it should fail with a formatted fatal error message "
@@ -18,30 +18,32 @@ section("it should fail with a formatted fatal error message "
   set(REASON_MULTILINE "some reason\non multiple lines")
 
   assert_fatal_error(
-    CALL fail "something happened" REASON
-    MESSAGE "something happened:\n  some reason")
+    CALL fail "something happened because of" REASON
+    MESSAGE "something happened because of 'some reason'")
 
   assert_fatal_error(
-    CALL fail "something happened" REASON_MULTILINE
-    MESSAGE "something happened:\n  some reason\n  on multiple lines")
+    CALL fail "something happened because of" REASON_MULTILINE
+    MESSAGE "something happened because of:\n"
+      "  some reason\n  on multiple lines")
 
   assert_fatal_error(
-    CALL fail "something happened\non multiple lines" REASON
-    MESSAGE "something happened\non multiple lines:\n  some reason")
+    CALL fail "something happened\non multiple lines because of" REASON
+    MESSAGE "something happened\non multiple lines because of 'some reason'")
 
   assert_fatal_error(
-    CALL fail "something happened\non multiple lines" REASON_MULTILINE
-    MESSAGE "something happened\non multiple lines:\n"
+    CALL fail "something happened\non multiple lines because of"
+      REASON_MULTILINE
+    MESSAGE "something happened\non multiple lines because of:\n"
       "  some reason\n  on multiple lines")
 
   assert_fatal_error(
-    CALL fail "something happened" "on multiple lines" REASON
-    MESSAGE "something happened\non multiple lines:\n  some reason")
+    CALL fail "something happened" "not on multiple lines because of" REASON
+    MESSAGE "something happened not on multiple lines because of 'some reason'")
 
   assert_fatal_error(
     CALL fail
-      "something happened" "on multiple lines" REASON
-      "something else happened" REASON_MULTILINE
-    MESSAGE "something happened\non multiple lines:\n  some reason\n"
-      "something else happened:\n  some reason\n  on multiple lines")
+      "something happened" "not on multiple lines because of" REASON
+      "something else happened because of" REASON_MULTILINE
+    MESSAGE "something happened not on multiple lines because of 'some reason' "
+      "something else happened because of:\n  some reason\n  on multiple lines")
 endsection()