[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1323-g9198013

David Cole david.cole at kitware.com
Wed Dec 26 16:03:44 EST 2012


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  91980130717d5364f377b76de21173fa07194e60 (commit)
       via  bf51a9310dadaa9e31b2ffa455c82a2318cb99e6 (commit)
      from  1992d42affb61823aa76ff6fc3d9083d7b7e2a58 (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=91980130717d5364f377b76de21173fa07194e60
commit 91980130717d5364f377b76de21173fa07194e60
Merge: 1992d42 bf51a93
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Dec 26 16:03:42 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 26 16:03:42 2012 -0500

    Merge topic 'fix-12904-avoid-overflow' into next
    
    bf51a93 Fix CTestLimitDashJ test to work with Visual Studio (#12904)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf51a9310dadaa9e31b2ffa455c82a2318cb99e6
commit bf51a9310dadaa9e31b2ffa455c82a2318cb99e6
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Dec 26 15:59:50 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Dec 26 16:01:29 2012 -0500

    Fix CTestLimitDashJ test to work with Visual Studio (#12904)
    
    - Use correct project name to match the generated *.sln file name
    - Pass a -C argument so that the tests in the test project actually
    run on Visual Studio dashboards

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5e65dd5..b3302f9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1959,7 +1959,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(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4 --output-on-failure)
+  add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4
+    --output-on-failure -C "\${CTestTest_CONFIG}")
 
   add_test(CTestTestPrintLabels ${CMAKE_CTEST_COMMAND} --print-labels)
   set_tests_properties(CTestTestPrintLabels PROPERTIES LABELS "Label1;Label2")
diff --git a/Tests/CTestLimitDashJ/CMakeLists.txt b/Tests/CTestLimitDashJ/CMakeLists.txt
index b0be607..0c5950c 100644
--- a/Tests/CTestLimitDashJ/CMakeLists.txt
+++ b/Tests/CTestLimitDashJ/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
-project(LimitDashJ NONE)
+project(CTestLimitDashJ NONE)
 
 # This file demonstrates http://public.kitware.com/Bug/view.php?id=12904
 # when configured with CMake 2.8.10.2 and earlier, and when running

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list