diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-08 12:33:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-08 12:33:39 (GMT) |
| commit | 687a26b7023748cc98317eae53ee2ac3cc520bda (patch) | |
| tree | 7c99bf3efb499cb12e0e85fe0a0c28e73df1466f /Source/cmCTest.cxx | |
| parent | e770b1b86e7157db4191096f226a8b0175819cff (diff) | |
| download | CMake-687a26b7023748cc98317eae53ee2ac3cc520bda.zip CMake-687a26b7023748cc98317eae53ee2ac3cc520bda.tar.gz CMake-687a26b7023748cc98317eae53ee2ac3cc520bda.tar.bz2 | |
CTest: Fix regression in build-and-test timeout forwarding
Refactoring in commit 66419bc046 (CTest: convert timeouts to
std::chrono::duration, 2017-11-20) changed out "infinite" timeout
to a value not representable by a 64-bit integer. Update the
`--build-and-test` forwarding of `--test-timeout` to not forward
an "infinite" timeout.
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 2cd60e5..ed45644 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1131,6 +1131,7 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output, // invocations. Since --build-generator is required this is a // good place to check for it, and to add the arguments in if (strcmp(i, "--build-generator") == 0 && + timeout != std::chrono::duration<double>::max() && timeout > std::chrono::duration<double>::zero()) { args.push_back("--test-timeout"); std::ostringstream msg; |