This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via f923940b7c9c93179b7ea6356c32c8a7beedebe2 (commit)
via 909842fff98983bff8b61c37b11a99d89dcc4d36 (commit)
from 2f779b24d65321dc05974c46a69cc3150f3d09cd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f923940b7c9c93179b7ea6356c32c8a7beedebe2
commit f923940b7c9c93179b7ea6356c32c8a7beedebe2
Merge: 2f779b2 909842f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 17 14:47:27 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Oct 17 14:47:27 2016 -0400
Merge topic 'timeout_after_match_testtime' into next
909842ff CTest: report time spent after matching output
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=909842fff98983bff8b61c37b11a99d89dcc4d36
commit 909842fff98983bff8b61c37b11a99d89dcc4d36
Author: Zack Galbreath <zack.galbre...@kitware.com>
AuthorDate: Mon Oct 17 11:24:01 2016 -0400
Commit: Zack Galbreath <zack.galbre...@kitware.com>
CommitDate: Mon Oct 17 11:24:32 2016 -0400
CTest: report time spent after matching output
When using the TIMEOUT_AFTER_MATCH test property, only report the
time spent by the test after the matching output was found.
diff --git a/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
b/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
index a191a9c..d607992 100644
--- a/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
+++ b/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
@@ -22,7 +22,9 @@ When the test outputs a line that matches ``regex`` its start
time is
reset to the current time and its timeout duration is changed to
``seconds``. Prior to this, the timeout duration is determined by the
:prop_test:`TIMEOUT` property or the :variable:`CTEST_TEST_TIMEOUT`
-variable if either of these are set.
+variable if either of these are set. Because the test's start time is
+reset, its execution time will not include any time that was spent
+waiting for the matching output.
:prop_test:`TIMEOUT_AFTER_MATCH` is useful for avoiding spurious
timeouts when your test must wait for some system resource to become
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()
-----------------------------------------------------------------------
Summary of changes:
Help/prop_test/TIMEOUT_AFTER_MATCH.rst | 4 +++-
Source/CTest/cmProcess.cxx | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
