[Cmake-commits] CMake branch, next, updated. v3.5.0-559-g5b9c6c1

[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  5b9c6c10af412507acce3651d02da93b670767bd (commit)
       via  6f6571ec24bddae0341714a481617f551c872947 (commit)
      from  46764d8624b86571d8036b0ac210d3d697c101e5 (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=5b9c6c10af412507acce3651d02da93b670767bd
commit 5b9c6c10af412507acce3651d02da93b670767bd
Merge: 46764d8 6f6571e
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Mar 21 10:12:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 21 10:12:53 2016 -0400

    Merge topic 'timeout_after_match' into next
    
    6f6571ec Increase margin of error for "ShouldPass" case


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f6571ec24bddae0341714a481617f551c872947
commit 6f6571ec24bddae0341714a481617f551c872947
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Mar 21 10:01:50 2016 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Mon Mar 21 10:12:02 2016 -0400

    Increase margin of error for "ShouldPass" case
    
    Help this test pass on busy nightly builds without unnecessarily
    increasing the amount of time it takes to run.

diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake
index 237a013..ee4db83 100644
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake
@@ -8,4 +8,4 @@ endfunction()
 run_ctest_TimeoutAfterMatch(MissingArg1 "\"-Darg2=Test started\"")
 run_ctest_TimeoutAfterMatch(MissingArg2 "\"-Darg1=2\"")
 run_ctest_TimeoutAfterMatch(ShouldTimeout "\"-Darg1=1\" \"-Darg2=Test started\"")
-run_ctest_TimeoutAfterMatch(ShouldPass "\"-Darg1=2\" \"-Darg2=Test started\"")
+run_ctest_TimeoutAfterMatch(ShouldPass "\"-Darg1=15\" \"-Darg2=Test started\"")

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

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


hooks/post-receive
-- 
CMake