summaryrefslogtreecommitdiffstats
path: root/Help/release
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-03-22 20:09:28 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-03-22 20:09:28 (GMT)
commit6201c1a6ce4326585bc2c4354119a59134e0be11 (patch)
tree981e78bbb7bb2e3fc5bd8fc7ab37830e11b37519 /Help/release
parent208524b822f7f6ccbe0414452cd9b050263565bc (diff)
parentde7afd2996b9e2055716c2f10a8e64d3fc793efa (diff)
downloadCMake-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/release')
-rw-r--r--Help/release/dev/timeout_after_match.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Help/release/dev/timeout_after_match.rst b/Help/release/dev/timeout_after_match.rst
new file mode 100644
index 0000000..83f316d
--- /dev/null
+++ b/Help/release/dev/timeout_after_match.rst
@@ -0,0 +1,6 @@
+timeout_after_match
+-------------------
+
+* CTest learned to optionally enforce a secondary timeout after matching
+ certain output from a test. See the :prop_test:`TIMEOUT_AFTER_MATCH` test
+ property.