diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-12 13:02:25 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-12 08:02:33 -0500 |
| commit | 1f5b2a8de93dc828d0cdc650478999133273c2c7 (patch) | |
| tree | 7a0abc413deb20ee13a21065a7b6e0784d5fba41 /Source/cmCTest.h | |
| parent | 62d8bff146b28c10c11ad7ef8114f8d06f2fcad8 (diff) | |
| parent | ba6caafa42afb7fa2c7d8d0d49c73d79efee1e9c (diff) | |
| download | cmake-1f5b2a8de93dc828d0cdc650478999133273c2c7.tar.gz | |
Merge topic 'fix-ctest-chrono'
ba6caafa CTest: Use integer-representable value for "infinite" timeout
548e8f6f CTest: Simplify std::chrono::duration<double> conversion to double
de0035fd cmCTestBuildAndTestHandler: Convert timeout to std::chrono::duration
687a26b7 CTest: Fix regression in build-and-test timeout forwarding
e770b1b8 CTest: Fix regression in build-and-test timeout compuatation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: dublet <github@dublet.org>
Merge-request: !1574
Diffstat (limited to 'Source/cmCTest.h')
| -rw-r--r-- | Source/cmCTest.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 44a635052f..23d71cb70b 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -208,6 +208,8 @@ public: */ std::chrono::duration<double> GetRemainingTimeAllowed(); + static std::chrono::duration<double> MaxDuration(); + /** * Open file in the output directory and set the stream */ |