Arrange output in a better way

Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake

@@ -32,9 +32,9 @@ execute_process(COMMAND ${CPackCommand} -G ${CPackGen}
     WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR})
 
 if (CPack_result)
-  message(SEND_ERROR "CPack_output=${CPack_output}")
-  message(SEND_ERROR "CPack_error=${CPack_error}")
-  message(FATAL_ERROR "error: CPack execution went wrong!")
+  message(FATAL_ERROR "error: CPack execution went wrong!, CPack_output=${CPack_output}, CPack_error=${CPack_error}")
+else (CPack_result)
+  message(STATUS "CPack_output=${CPack_output}")
 endif(CPack_result)
 
 if(CPackGen MATCHES "ZIP")
@@ -55,16 +55,12 @@ if(expected_file_mask)
   message(STATUS "expected_file_mask='${expected_file_mask}'")
 
   if(NOT expected_file)
-    message(SEND_ERROR "CPack_output=${CPack_output}")
-    message(SEND_ERROR "CPack_error=${CPack_error}")
-    message(FATAL_ERROR "error: expected_file=${expected_file} does not exist: CPackComponentsForAll test fails.")
+    message(FATAL_ERROR "error: expected_file=${expected_file} does not exist: CPackComponentsForAll test fails. (CPack_output=${CPack_output}, CPack_error=${CPack_error}")
   endif(NOT expected_file)
 
   list(LENGTH expected_file actual_count)
   message(STATUS "actual_count='${actual_count}'")
   if(NOT actual_count EQUAL expected_count)
-    message(SEND_ERROR "CPack_output=${CPack_output}")
-    message(SEND_ERROR "CPack_error=${CPack_error}")
-    message(FATAL_ERROR "error: expected_count=${expected_count} does not match actual_count=${actual_count}: CPackComponents test fails.")
+    message(FATAL_ERROR "error: expected_count=${expected_count} does not match actual_count=${actual_count}: CPackComponents test fails. (CPack_output=${CPack_output}, CPack_error=${CPack_error})")
   endif(NOT actual_count EQUAL expected_count)
 endif(expected_file_mask)