[Cmake-commits] CMake branch, next, updated. v2.8.12-4360-g6ad06db

Nils Gladitz nilsgladitz at gmail.com
Wed Oct 23 15:48:15 EDT 2013


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  6ad06dbb1416c42621eef1db46e6daab1a0824ca (commit)
       via  474de81845d15b305016ed748556c5c8ec697901 (commit)
      from  2b5ebe3f05b044055251d7c26566a47066d166a4 (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=6ad06dbb1416c42621eef1db46e6daab1a0824ca
commit 6ad06dbb1416c42621eef1db46e6daab1a0824ca
Merge: 2b5ebe3 474de81
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Oct 23 15:48:13 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 23 15:48:13 2013 -0400

    Merge topic 'ctest-fix-run-serial' into next
    
    474de81 Tests: ctest requires -C for multi-configuration generators


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=474de81845d15b305016ed748556c5c8ec697901
commit 474de81845d15b305016ed748556c5c8ec697901
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Oct 23 21:47:32 2013 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Oct 23 21:47:32 2013 +0200

    Tests: ctest requires -C for multi-configuration generators

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 0d35104..d5dec90 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2074,7 +2074,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log"
     )
 
-  ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4)
+  ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4
+    --output-on-failure -C "\${CTestTest_CONFIG}")
 
   if(NOT BORLAND)
     set(CTestLimitDashJ_EXTRA_OPTIONS --force-new-ctest-process)

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

Summary of changes:
 Tests/CMakeLists.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list