summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-10-18 12:43:03 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-10-18 12:43:03 (GMT)
commita5f0e629887055085eec40da4ad4d147c6887a33 (patch)
tree44a5c3ab5f12632f738c7c324a4d7cdf0fd5b3a8 /Source/CTest
parent99177a2029fd30d37d49ad2026fb5438f1d07c8f (diff)
parent909842fff98983bff8b61c37b11a99d89dcc4d36 (diff)
downloadCMake-a5f0e629887055085eec40da4ad4d147c6887a33.zip
CMake-a5f0e629887055085eec40da4ad4d147c6887a33.tar.gz
CMake-a5f0e629887055085eec40da4ad4d147c6887a33.tar.bz2
Merge topic 'timeout_after_match_testtime'
909842ff CTest: report time spent after matching output
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmProcess.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx
index cf3c7ac..a24fe21 100644
--- a/Source/CTest/cmProcess.cxx
+++ b/Source/CTest/cmProcess.cxx
@@ -225,6 +225,7 @@ void cmProcess::ChangeTimeout(double t)
void cmProcess::ResetStartTime()
{
cmsysProcess_ResetStartTime(this->Process);
+ this->StartTime = cmSystemTools::GetTime();
}
int cmProcess::GetExitException()