diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-05 13:12:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-05 13:12:52 (GMT) |
| commit | b8e7af979d3d6dfef05fcebefe18907963221220 (patch) | |
| tree | 049b34c1c621ae4e167d7e3644800e78809e9cec /Source/CTest/cmCTestBuildHandler.cxx | |
| parent | 8616e9ba246242ff39d166afd2458fc78031918e (diff) | |
| parent | 66419bc04620c5748df77e2b563d65b0e97b623a (diff) | |
| download | CMake-b8e7af979d3d6dfef05fcebefe18907963221220.zip CMake-b8e7af979d3d6dfef05fcebefe18907963221220.tar.gz CMake-b8e7af979d3d6dfef05fcebefe18907963221220.tar.bz2 | |
Merge topic 'ctest-chrono'
66419bc0 CTest: convert timeouts to std::chrono::duration
923b8fad IWYU: Add mappings for std::enable_if on chrono durations
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1513
Diffstat (limited to 'Source/CTest/cmCTestBuildHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index f25c9c3..ef4d3c6 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -17,7 +17,6 @@ #include <set> #include <stdlib.h> #include <string.h> -#include <type_traits> static const char* cmCTestErrorMatches[] = { "^[Bb]us [Ee]rror", @@ -283,7 +282,7 @@ int cmCTestBuildHandler::ProcessHandler() this->Quiet); // do we have time for this - if (this->CTest->GetRemainingTimeAllowed() < 120) { + if (this->CTest->GetRemainingTimeAllowed() < std::chrono::minutes(2)) { return 0; } |