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/cmCTest.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/cmCTest.cxx')
-rw-r--r-- | Source/cmCTest.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 4be02ed..9e76480 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1092,14 +1092,11 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output, if (timeout <= cmDuration::zero()) { timeout = std::chrono::seconds(1); } - cmCTestLog( - this, HANDLER_VERBOSE_OUTPUT, "Test timeout computed to be: " - << (timeout == cmCTest::MaxDuration() - ? std::string("infinite") - : std::to_string( - std::chrono::duration_cast<std::chrono::seconds>(timeout) - .count())) - << "\n"); + cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "Test timeout computed to be: " + << (timeout == cmCTest::MaxDuration() + ? std::string("infinite") + : std::to_string(cmDurationTo<unsigned int>(timeout))) + << "\n"); if (cmSystemTools::SameFile(argv[0], cmSystemTools::GetCTestCommand()) && !this->ForceNewCTestProcess) { cmCTest inst; @@ -1121,8 +1118,7 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output, timeout > cmDuration::zero()) { args.push_back("--test-timeout"); std::ostringstream msg; - msg << std::chrono::duration_cast<std::chrono::seconds>(timeout) - .count(); + msg << cmDurationTo<unsigned int>(timeout); args.push_back(msg.str()); } args.push_back(i); |