From cc1f1014e303522fb6b860c0a4343a06c32ad5cb Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Tue, 18 Sep 2007 11:34:53 -0400
Subject: [PATCH] ENH: allow test properties to set a timeout that is longer
 than the default timeout, but not longer than CTEST_TIME_LIMIT for a script

---
 Source/cmCTest.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 8158257c9..6c1d3bd0f 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1095,10 +1095,12 @@ int cmCTest::RunTest(std::vector<const char*> argv,
     {
     timeout = this->TimeOut;
     }
-  if (testTimeOut && testTimeOut < timeout)
+  if (testTimeOut 
+      && testTimeOut < this->GetRemainingTimeAllowed())
     {
     timeout = testTimeOut;
     }
+
   // always have at least 1 second if we got to here
   if (timeout <= 0)
     {