[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3758-gdfbc787

[Brad King]

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  dfbc7873da9ef0e5ec0267d20de7bdf41f12b54f (commit)
       via  cd345aa77ded14ab729b11e1ce3ecb709d59b6eb (commit)
      from  72d4c12a701a25d5ffc4ae31b349feb23b264c22 (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=dfbc7873da9ef0e5ec0267d20de7bdf41f12b54f
commit dfbc7873da9ef0e5ec0267d20de7bdf41f12b54f
Merge: 72d4c12 cd345aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 7 10:46:24 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 7 10:46:24 2013 -0400

    Merge topic 'borland-no-CTestLimitDashJ' into next
    
    cd345aa Skip CTestLimitDashJ test on Borland


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd345aa77ded14ab729b11e1ce3ecb709d59b6eb
commit cd345aa77ded14ab729b11e1ce3ecb709d59b6eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 7 10:41:06 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 7 10:41:06 2013 -0400

    Skip CTestLimitDashJ test on Borland
    
    The Borland-built CTest binary has trouble running many instances of
    itself in parallel, making the test unreliable.  No particular recent
    change appears to be the culprit and the failure is not reliably
    reproducible.  Just silence the failure for now by skipping the test.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dc8d869..9c3ed59 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2056,9 +2056,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log"
     )
 
-  set(CTestLimitDashJ_EXTRA_OPTIONS --force-new-ctest-process)
-  add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4
-    --output-on-failure -C "\${CTestTest_CONFIG}")
+  if(NOT BORLAND)
+    set(CTestLimitDashJ_EXTRA_OPTIONS --force-new-ctest-process)
+    add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4
+      --output-on-failure -C "\${CTestTest_CONFIG}")
+  endif()
 
   add_test(CTestTestPrintLabels ${CMAKE_CTEST_COMMAND} --print-labels)
   set_tests_properties(CTestTestPrintLabels PROPERTIES LABELS "Label1;Label2")

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

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


hooks/post-receive
-- 
CMake