diff options
author | Wouter Klouwen <wouter.klouwen@youview.com> | 2017-12-12 21:59:43 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-01-23 15:05:12 (GMT) |
commit | ff62b00522d1ddaeb88be241ab4a022f935b5c00 (patch) | |
tree | 5144559ff41c2374fd01637b0326fb18eed2c1eb /Source/CTest/cmCTestRunTest.cxx | |
parent | 695951bc46fa4bc4eaf686c4ee6dce24c579bc45 (diff) | |
download | CMake-ff62b00522d1ddaeb88be241ab4a022f935b5c00.zip CMake-ff62b00522d1ddaeb88be241ab4a022f935b5c00.tar.gz CMake-ff62b00522d1ddaeb88be241ab4a022f935b5c00.tar.bz2 |
CTest: add safe conversion from cmDuration to integer types
A problem area by recent refactoring of time to std::chrono has been the
unsafe conversion from duration<double> to std::chrono::seconds, which
is of an unspecified integer type.
This commit adds a template function that for a given type provides a
safe conversion, effectively clamping a duration<double> into what fits
safely in that type. A specialisation for int and unsigned int are
provided.
It changes the protential problem areas to use this safe function.
Diffstat (limited to 'Source/CTest/cmCTestRunTest.cxx')
-rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index a5ec93d..8d602fa 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -621,17 +621,11 @@ bool cmCTestRunTest::ForkProcess(cmDuration testTimeOut, bool explicitTimeout, if (testTimeOut == cmDuration::zero() && explicitTimeout) { timeout = cmDuration::zero(); } - cmCTestOptionalLog( - this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index - << ": " - << "Test timeout computed to be: " - << (timeout == cmCTest::MaxDuration() - ? std::string("infinite") - : std::to_string( - std::chrono::duration_cast<std::chrono::seconds>(timeout) - .count())) - << "\n", - this->TestHandler->GetQuiet()); + cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index + << ": " + << "Test timeout computed to be: " + << cmDurationTo<unsigned int>(timeout) << "\n", + this->TestHandler->GetQuiet()); this->TestProcess->SetTimeout(timeout); |