summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-10-18 12:43:03 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-10-18 12:43:03 (GMT)
commita5f0e629887055085eec40da4ad4d147c6887a33 (patch)
tree44a5c3ab5f12632f738c7c324a4d7cdf0fd5b3a8 /Help
parent99177a2029fd30d37d49ad2026fb5438f1d07c8f (diff)
parent909842fff98983bff8b61c37b11a99d89dcc4d36 (diff)
downloadCMake-a5f0e629887055085eec40da4ad4d147c6887a33.zip
CMake-a5f0e629887055085eec40da4ad4d147c6887a33.tar.gz
CMake-a5f0e629887055085eec40da4ad4d147c6887a33.tar.bz2
Merge topic 'timeout_after_match_testtime'
909842ff CTest: report time spent after matching output
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_test/TIMEOUT_AFTER_MATCH.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Help/prop_test/TIMEOUT_AFTER_MATCH.rst b/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
index a191a9c..d607992 100644
--- a/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
+++ b/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
@@ -22,7 +22,9 @@ When the test outputs a line that matches ``regex`` its start time is
reset to the current time and its timeout duration is changed to
``seconds``. Prior to this, the timeout duration is determined by the
:prop_test:`TIMEOUT` property or the :variable:`CTEST_TEST_TIMEOUT`
-variable if either of these are set.
+variable if either of these are set. Because the test's start time is
+reset, its execution time will not include any time that was spent
+waiting for the matching output.
:prop_test:`TIMEOUT_AFTER_MATCH` is useful for avoiding spurious
timeouts when your test must wait for some system resource to become