[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-738-g333b0bc

[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  333b0bc7055efb1369fa6cda0586e68553c8ebe3 (commit)
       via  91b3ae8e25e439340421573b3a270648a39a5e2f (commit)
      from  5da2e18f384f4a748eb0e440b482a444deede5d5 (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=333b0bc7055efb1369fa6cda0586e68553c8ebe3
commit 333b0bc7055efb1369fa6cda0586e68553c8ebe3
Merge: 5da2e18 91b3ae8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 30 10:21:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 30 10:21:14 2015 -0400

    Merge topic 'ctest-test-load' into next
    
    91b3ae8e fixup! ctest: Optionally avoid starting tests that may exceed a given CPU load


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91b3ae8e25e439340421573b3a270648a39a5e2f
commit 91b3ae8e25e439340421573b3a270648a39a5e2f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 30 10:21:01 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 30 10:21:01 2015 -0400

    fixup! ctest: Optionally avoid starting tests that may exceed a given CPU load

diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index be4a958..aba1daf 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -1,5 +1,5 @@
 include(RunCMake)
-set(RunCMake_TEST_TIMEOUT 30)
+set(RunCMake_TEST_TIMEOUT 60)
 
 unset(ENV{CTEST_PARALLEL_LEVEL})
 unset(ENV{CTEST_OUTPUT_ON_FAILURE})
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index f1827c2..21d0447 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -1,5 +1,5 @@
 include(RunCTest)
-set(RunCMake_TEST_TIMEOUT 30)
+set(RunCMake_TEST_TIMEOUT 60)
 
 set(CASE_CTEST_TEST_ARGS "")
 set(CASE_CTEST_TEST_LOAD "")

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

Summary of changes:
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake |    2 +-
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake