[Cmake-commits] CMake branch, next, updated. v3.0.1-5080-g7aaeec4

[Nils Gladitz]

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  7aaeec4f75ac97cf3e063f329f9bf6950d55caf0 (commit)
       via  454c24576bc9a6f15eb693348690dae3934e7b16 (commit)
       via  75abb6da979b4abfaf5e00b32c81239116fa2406 (commit)
      from  5d9d4acb8c4170d6c8b5071acee4638916082a9b (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=7aaeec4f75ac97cf3e063f329f9bf6950d55caf0
commit 7aaeec4f75ac97cf3e063f329f9bf6950d55caf0
Merge: 5d9d4ac 454c245
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Sep 1 03:10:52 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 1 03:10:52 2014 -0400

    Merge topic 'wix-log-on-failure' into next
    
    454c2457 CPackWiX: Attach wix.log on test failure.
    75abb6da CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=454c24576bc9a6f15eb693348690dae3934e7b16
commit 454c24576bc9a6f15eb693348690dae3934e7b16
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Sep 1 09:09:00 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Sep 1 09:09:00 2014 +0200

    CPackWiX: Attach wix.log on test failure.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f51a934..8964fbe 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -851,7 +851,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
       DOC "WiX Toolset light.exe location")
 
     if(WIX_LIGHT_EXECUTABLE)
-      add_test(CPackWiXGenerator ${CMAKE_CTEST_COMMAND}
+      add_test(NAME CPackWiXGenerator COMMAND ${CMAKE_CTEST_COMMAND}
         -C \${CTEST_CONFIGURATION_TYPE}
         --build-and-test
         "${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator"
@@ -863,6 +863,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
           "-DCPackWiXGenerator_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackWiXGenerator"
           "-Dconfig=\${CTEST_CONFIGURATION_TYPE}"
           -P "${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake")
+
+      set_property(TEST CPackWiXGenerator PROPERTY
+        ATTACHED_FILES_ON_FAIL
+        "${CMake_BINARY_DIR}/Tests/CPackWiXGenerator/_CPack_Packages/win32/WIX/wix.log")
     endif()
   endif()
 

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Tests/CMakeLists.txt      |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake