From c32088cfee5f6b6957dffd47614809ef7e19be8d Mon Sep 17 00:00:00 2001
From: Zach Mullen <zach.mullen@kitware.com>
Date: Tue, 8 Dec 2009 10:26:43 -0500
Subject: Local test timeouts will now always take precedence over the global
 --timeout option.

---
 Source/CTest/cmCTestTestHandler.cxx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 1718ac3..cbac272 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1051,8 +1051,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
       p.Cost = rand();
       }
 
-    if((p.Timeout == 0 || p.Timeout > this->CTest->GetGlobalTimeout())
-       && this->CTest->GetGlobalTimeout() != 0)
+    if(p.Timeout == 0 && this->CTest->GetGlobalTimeout() != 0)
       {
       p.Timeout = this->CTest->GetGlobalTimeout();
       }
-- 
cgit v0.12