diff options
| author | Regina Pfeifer <regina@mailbox.org> | 2018-12-09 21:10:31 (GMT) |
|---|---|---|
| committer | Regina Pfeifer <regina@mailbox.org> | 2018-12-09 21:10:31 (GMT) |
| commit | 3e0eb3307f2fd4c70fdb6eb4cd0ab44196107c89 (patch) | |
| tree | d4cf63a84de6e83db040e2b4f178f98e14d85fa6 | |
| parent | dd8c575932b0b1462c3f4f1cbbab1a5fb1526036 (diff) | |
| download | CMake-3e0eb3307f2fd4c70fdb6eb4cd0ab44196107c89.zip CMake-3e0eb3307f2fd4c70fdb6eb4cd0ab44196107c89.tar.gz CMake-3e0eb3307f2fd4c70fdb6eb4cd0ab44196107c89.tar.bz2 | |
Help: clarify documentation of ctest --timeout
| -rw-r--r-- | Help/manual/ctest.1.rst | 7 | ||||
| -rw-r--r-- | Source/ctest.cxx | 2 |
2 files changed, 5 insertions, 4 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. 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." }, |