summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestRunTest.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-05-04 20:51:31 (GMT)
committerBrad King <brad.king@kitware.com>2023-05-04 21:09:00 (GMT)
commit426e38cc104673e8056caa243950c330a87e20af (patch)
treeb47744feb5eea76471d63988c2522df48bb6935e /Source/CTest/cmCTestRunTest.cxx
parent59336b29bd713c288423d8330c74b74cfc0eaf58 (diff)
downloadCMake-426e38cc104673e8056caa243950c330a87e20af.zip
CMake-426e38cc104673e8056caa243950c330a87e20af.tar.gz
CMake-426e38cc104673e8056caa243950c330a87e20af.tar.bz2
cmCTestRunTest: Adopt decision for starting cmProcess timer
Diffstat (limited to 'Source/CTest/cmCTestRunTest.cxx')
-rw-r--r--Source/CTest/cmCTestRunTest.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 307312d..46cb54e 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -770,7 +770,11 @@ bool cmCTestRunTest::ForkProcess(cmDuration testTimeOut)
<< "\n",
this->TestHandler->GetQuiet());
- this->TestProcess->SetTimeout(timeout);
+ // An explicit TIMEOUT=0 test property means "no timeout".
+ if (timeout != cmDuration::zero() ||
+ !this->TestProperties->ExplicitTimeout) {
+ this->TestProcess->SetTimeout(timeout);
+ }
cmSystemTools::SaveRestoreEnvironment sre;
std::ostringstream envMeasurement;