[Cmake-commits] CMake branch, next, updated. v3.5.0-527-g7d01f32

[Zack Galbreath]

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  7d01f3219105fe43ce0059709e4a266847a270bd (commit)
       via  6622b2c63e4b034b064b99893f0721440110a2af (commit)
      from  cfcba931392b24886b41037042353b43f9d46615 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d01f3219105fe43ce0059709e4a266847a270bd
commit 7d01f3219105fe43ce0059709e4a266847a270bd
Merge: cfcba93 6622b2c
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Mar 18 09:56:24 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 18 09:56:24 2016 -0400

    Merge topic 'timeout_after_match' into next
    
    6622b2c6 Increase default timeout for test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6622b2c63e4b034b064b99893f0721440110a2af
commit 6622b2c63e4b034b064b99893f0721440110a2af
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Mar 18 09:55:46 2016 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Fri Mar 18 09:55:46 2016 -0400

    Increase default timeout for test
    
    This change should help this test pass more reliably on
    systems that take > 1 second to configure a NONE project.

diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in b/Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in
index 24d1673..e9592f6 100644
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in
+++ b/Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in
@@ -2,5 +2,5 @@ cmake_minimum_required(VERSION 3.4)
 project(TimeoutAfterMatch NONE)
 include(CTest)
 add_test(NAME SleepFor1Second COMMAND "${CMAKE_COMMAND}" -P ${CMAKE_SOURCE_DIR}/SleepFor1Second.cmake)
-set_property(TEST SleepFor1Second PROPERTY TIMEOUT 4)
+set_property(TEST SleepFor1Second PROPERTY TIMEOUT 30)
 set_property(TEST SleepFor1Second PROPERTY TIMEOUT_AFTER_MATCH "${arg1}" "${arg2}")

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

Summary of changes:
 Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake