[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-662-ge9312e3

[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  e9312e3d62c94747351f6d054e260db57a14e01f (commit)
       via  68b7a08265a098a336f59b6a03b5c1cd83c6fdd4 (commit)
      from  38633cced6a8d0e72a930b36fa899c865f3c5184 (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=e9312e3d62c94747351f6d054e260db57a14e01f
commit e9312e3d62c94747351f6d054e260db57a14e01f
Merge: 38633cc 68b7a08
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 25 10:35:26 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 25 10:35:26 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68b7a08265a098a336f59b6a03b5c1cd83c6fdd4
commit 68b7a08265a098a336f59b6a03b5c1cd83c6fdd4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 25 10:35:08 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 25 10:35:08 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 91f8d6e..be4a958 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -1,5 +1,5 @@
 include(RunCMake)
-set(RunCMake_TEST_TIMEOUT 10)
+set(RunCMake_TEST_TIMEOUT 30)
 
 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 667e107..f1827c2 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 10)
+set(RunCMake_TEST_TIMEOUT 30)
 
 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