[Cmake-commits] CMake branch, next, updated. v2.8.3-808-ga818b0f

[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  a818b0f8778ed31bab695708605d42cc2c0cb4a8 (commit)
       via  cbdc46356dacb75f1901da44e00ac96c1af24408 (commit)
      from  c9c1272a165b5e7f081746b975881b404d888586 (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=a818b0f8778ed31bab695708605d42cc2c0cb4a8
commit a818b0f8778ed31bab695708605d42cc2c0cb4a8
Merge: c9c1272 cbdc463
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Dec 12 06:26:53 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Dec 12 06:26:53 2010 -0500

    Merge topic 'CPack-AddMoreTests' into next
    
    cbdc463 CPackTest spit out more output in case of failure


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

    CPackTest spit out more output in case of failure

diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index b24ae5a..e519893 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -20,14 +20,23 @@ endif(NOT CPackComponentWay)
 
 set(expected_file_mask "")
 # The usual default behavior is to expect a single file
+# Then some specific generators (Archive, RPM, ...)
+# May produce several numbers of files depending on
+# CPACK_COMPONENT_xxx values
 set(expected_count 1)
 
 execute_process(COMMAND ${CPackCommand} -G ${CPackGen}
-    RESULT_VARIABLE result
-    OUTPUT_VARIABLE stdout
-    ERROR_VARIABLE stderr
+    RESULT_VARIABLE CPack_result
+    OUTPUT_VARIABLE CPack_output
+    ERROR_VARIABLE CPack_error
     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!")
+endif(CPack_result)
+
 if(CPackGen MATCHES "ZIP")
     set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip")
     if (${CPackComponentWay} STREQUAL "default")
@@ -46,12 +55,16 @@ 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.")
   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.")
   endif(NOT actual_count EQUAL expected_count)
 endif(expected_file_mask)

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

Summary of changes:
 .../RunCPackVerifyResult.cmake                     |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake