diff options
| author | Wouter Klouwen <wouter.klouwen@youview.com> | 2017-11-15 18:00:09 (GMT) |
|---|---|---|
| committer | Wouter Klouwen <wouter.klouwen@youview.com> | 2017-11-17 15:22:55 (GMT) |
| commit | 5fd979a8a3bc13aaf20c2833fe513df192d82fb1 (patch) | |
| tree | 4a99189a6f387c43f92707645dcb0cfacb3d17ad /Source/CTest/cmCTestConfigureHandler.cxx | |
| parent | e31288582977c10972af9baa3b0e41d758094d21 (diff) | |
| download | CMake-5fd979a8a3bc13aaf20c2833fe513df192d82fb1.zip CMake-5fd979a8a3bc13aaf20c2833fe513df192d82fb1.tar.gz CMake-5fd979a8a3bc13aaf20c2833fe513df192d82fb1.tar.bz2 | |
CTest: adopt std::chrono::system_clock
After the refactor to make CTest use std::chrono::steady_clock for the
keeping of time for test duration, there are still references to
cmSystemTools::GetTime() left.
To further adopt std::chrono for time related activities, this commit
changes those remaining references to std::chrono::system_clock::now()
calls and alters the storage from either unsigned int or double to
std::chrono::system_clock::time_point.
For ease of conversion, a converter method is added to cmXMLWriter that
converts from a std::chrono::system_clock::time_point to the number of
seconds since the UN*X epoch as that is expected behaviour. This means
no more casts as required.
Functionally should be no difference as the system_clock is implemented
in the same terms.
Diffstat (limited to 'Source/CTest/cmCTestConfigureHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestConfigureHandler.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx index e732f9f..ab77986 100644 --- a/Source/CTest/cmCTestConfigureHandler.cxx +++ b/Source/CTest/cmCTestConfigureHandler.cxx @@ -4,7 +4,6 @@ #include "cmCTest.h" #include "cmGeneratedFileStream.h" -#include "cmSystemTools.h" #include "cmXMLWriter.h" #include <chrono> @@ -57,8 +56,7 @@ int cmCTestConfigureHandler::ProcessHandler() return 1; } std::string start_time = this->CTest->CurrentTime(); - unsigned int start_time_time = - static_cast<unsigned int>(cmSystemTools::GetTime()); + auto start_time_time = std::chrono::system_clock::now(); cmGeneratedFileStream ofs; this->StartLogFile("Configure", ofs); @@ -84,8 +82,7 @@ int cmCTestConfigureHandler::ProcessHandler() xml.Element("Log", output); xml.Element("ConfigureStatus", retVal); xml.Element("EndDateTime", this->CTest->CurrentTime()); - xml.Element("EndConfigureTime", - static_cast<unsigned int>(cmSystemTools::GetTime())); + xml.Element("EndConfigureTime", std::chrono::system_clock::now()); xml.Element("ElapsedMinutes", std::chrono::duration_cast<std::chrono::minutes>( std::chrono::steady_clock::now() - elapsed_time_start) |