summaryrefslogtreecommitdiffstats
path: root/Source
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 /Source
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 'Source')
-rw-r--r--Source/ctest.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index ca8a776..ca412ae 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -128,7 +128,7 @@ static const char* cmDocumentationOptions[][2] = {
{ "--schedule-random", "Use a random order for scheduling tests" },
{ "--submit-index",
"Submit individual dashboard tests with specific index" },
- { "--timeout <seconds>", "Set a global timeout on all tests." },
+ { "--timeout <seconds>", "Set the default test timeout." },
{ "--stop-time <time>",
"Set a time at which all tests should stop running." },
{ "--http1.0", "Submit using HTTP 1.0." },