summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-12-12 13:20:30 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-12-12 13:20:43 (GMT)
commitabccf484e3c13395520fea544885e139fc79475e (patch)
treea093946dc7c8a3d52893f0ebe69e21bc7506b7cb /Help
parented5087e32c517bac158f541fa7ea916c670ec915 (diff)
parent3e0eb3307f2fd4c70fdb6eb4cd0ab44196107c89 (diff)
downloadCMake-abccf484e3c13395520fea544885e139fc79475e.zip
CMake-abccf484e3c13395520fea544885e139fc79475e.tar.gz
CMake-abccf484e3c13395520fea544885e139fc79475e.tar.bz2
Merge topic 'default-test-timeout'
3e0eb3307f Help: clarify documentation of ctest --timeout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2721
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/ctest.1.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index 110b08f..1ef20ab 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -313,10 +313,11 @@ See `Build and Test Mode`_.
Do not use.
``--timeout <seconds>``
- Set a global timeout on all tests.
+ Set the default test timeout.
- This option will set a global timeout on all tests that do not
- already have a timeout set on them.
+ This option effectively sets a timeout on all tests that do not
+ already have a timeout set on them via the :prop_test:`TIMEOUT`
+ property.
``--stop-time <time>``
Set a time at which all tests should stop running.