diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-22 20:09:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-22 20:09:28 (GMT) |
| commit | 6201c1a6ce4326585bc2c4354119a59134e0be11 (patch) | |
| tree | 981e78bbb7bb2e3fc5bd8fc7ab37830e11b37519 /Help/manual | |
| parent | 208524b822f7f6ccbe0414452cd9b050263565bc (diff) | |
| parent | de7afd2996b9e2055716c2f10a8e64d3fc793efa (diff) | |
| download | CMake-6201c1a6ce4326585bc2c4354119a59134e0be11.zip CMake-6201c1a6ce4326585bc2c4354119a59134e0be11.tar.gz CMake-6201c1a6ce4326585bc2c4354119a59134e0be11.tar.bz2 | |
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
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index fbde4eb..578f85a 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -304,6 +304,7 @@ Properties on Tests /prop_test/RUN_SERIAL /prop_test/SKIP_RETURN_CODE /prop_test/TIMEOUT + /prop_test/TIMEOUT_AFTER_MATCH /prop_test/WILL_FAIL /prop_test/WORKING_DIRECTORY |