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;