[Cmake-commits] CMake branch, next, updated. v2.8.3-820-g3406737

[Eric Noulard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3406737f96ce4513a640519210d8ace677ede0ca (commit)
       via  66de27fcab89170d1cb3209786bfb37a702c2963 (commit)
      from  f12dc41ae44d20bbab965a439894081c66e4acca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3406737f96ce4513a640519210d8ace677ede0ca
commit 3406737f96ce4513a640519210d8ace677ede0ca
Merge: f12dc41 66de27f
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Dec 12 17:05:47 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Dec 12 17:05:47 2010 -0500

    Merge topic 'CPack-AddMoreTests' into next
    
    66de27f Arrange output in a better way


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66de27fcab89170d1cb3209786bfb37a702c2963
commit 66de27fcab89170d1cb3209786bfb37a702c2963
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Dec 12 22:35:18 2010 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Dec 12 22:35:18 2010 +0100

    Arrange output in a better way

diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index e519893..ee6b227 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/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)

-----------------------------------------------------------------------

Summary of changes:
 .../RunCPackVerifyResult.cmake                     |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake