Browse Source

Tests: Improve RunCMake.CPack_* failure message formatting

Format a `message(FATAL_ERROR)` call with markup to make the generated
message more readable so that the difference between the actual and
expected results is easier to see.
Brad King 9 years ago
parent
commit
7f90d5e5cc
1 changed files with 4 additions and 2 deletions
  1. 4 2
      Tests/RunCMake/CPack/VerifyResult.cmake

+ 4 - 2
Tests/RunCMake/CPack/VerifyResult.cmake

@@ -27,10 +27,12 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0)
           expected_content_list "${PACKAGE_CONTENT}")
 
       if(NOT expected_content_list)
+        string(REPLACE "\n" "\n actual> " msg_actual "\n${PACKAGE_CONTENT}")
+        string(REPLACE "\n" "\n expect> " msg_expected "\n${EXPECTED_FILE_CONTENT_${file_no_}}")
         message(FATAL_ERROR
           "Unexpected file content for file No. '${file_no_}'!\n"
-          " Content: '${PACKAGE_CONTENT}'\n\n"
-          " Expected: '${EXPECTED_FILE_CONTENT_${file_no_}}'"
+          "The content was:${msg_actual}\n"
+          "which does not match:${msg_expected}\n"
           "${output_error_message}")
       endif()
     else()