[Cmake-commits] CMake branch, master, updated. v3.5.0-292-g6201c1a

[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, master has been updated
       via  6201c1a6ce4326585bc2c4354119a59134e0be11 (commit)
       via  de7afd2996b9e2055716c2f10a8e64d3fc793efa (commit)
       via  993e48d0451b41f8e2c2a59473d9ddc09ada5792 (commit)
      from  208524b822f7f6ccbe0414452cd9b050263565bc (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=6201c1a6ce4326585bc2c4354119a59134e0be11
commit 6201c1a6ce4326585bc2c4354119a59134e0be11
Merge: 208524b de7afd2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 22 16:09:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 22 16:09:28 2016 -0400

    Merge topic 'timeout_after_match'
    
    de7afd29 Help: Add notes for topic 'timeout_after_match'
    993e48d0 CTest: Optionally use a secondary test timeout after matching output


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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    1 +
 Help/prop_test/TIMEOUT_AFTER_MATCH.rst             |   37 ++++++++++++++++++++
 Help/release/dev/timeout_after_match.rst           |    6 ++++
 Source/CTest/cmCTestRunTest.cxx                    |   22 ++++++++++++
 Source/CTest/cmCTestTestHandler.cxx                |   25 +++++++++++++
 Source/CTest/cmCTestTestHandler.h                  |    3 ++
 Source/CTest/cmProcess.cxx                         |   10 ++++++
 Source/CTest/cmProcess.h                           |    2 ++
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../CTestTimeoutAfterMatch/CMakeLists.txt.in       |    6 ++++
 .../CTestTimeoutAfterMatch/CTestConfig.cmake.in    |    1 +
 .../CTestTimeoutAfterMatch/MissingArg1-stderr.txt  |    1 +
 .../CTestTimeoutAfterMatch/MissingArg2-stderr.txt  |    1 +
 .../CTestTimeoutAfterMatch/RunCMakeTest.cmake      |   11 ++++++
 .../CTestTimeoutAfterMatch/ShouldPass-stdout.txt   |    6 ++++
 .../ShouldTimeout-stdout.txt                       |    1 +
 .../CTestTimeoutAfterMatch/SleepFor1Second.cmake   |    4 +++
 .../test.cmake.in                                  |   15 ++++----
 18 files changed, 147 insertions(+), 6 deletions(-)
 create mode 100644 Help/prop_test/TIMEOUT_AFTER_MATCH.rst
 create mode 100644 Help/release/dev/timeout_after_match.rst
 create mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg1-stderr.txt
 create mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg2-stderr.txt
 create mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/ShouldPass-stdout.txt
 create mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/ShouldTimeout-stdout.txt
 create mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/SleepFor1Second.cmake
 copy Tests/RunCMake/{ctest_coverage => CTestTimeoutAfterMatch}/test.cmake.in (71%)


hooks/post-receive
-- 
CMake