mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-07 15:18:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

CTest: Fix regression in build-and-test timeout forwarding

Browse Source 
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.
This commit is contained in:
Brad King
2017-12-08 07:33:39 -05:00
parent e770b1b86e
commit 687a26b702
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmCTest.cxx
View File

@@ -1131,6 +1131,7 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output,
// invocations. Since --build-generator is required this is a // invocations. Since --build-generator is required this is a
// good place to check for it, and to add the arguments in // good place to check for it, and to add the arguments in
if (strcmp(i, "--build-generator") == 0 && if (strcmp(i, "--build-generator") == 0 &&
timeout != std::chrono::duration<double>::max() &&
timeout > std::chrono::duration<double>::zero()) { timeout > std::chrono::duration<double>::zero()) {
args.push_back("--test-timeout"); args.push_back("--test-timeout");
std::ostringstream msg; std::ostringstream msg;