[cmake-commits] martink committed cmCTestBuildAndTestHandler.cxx 1.17 1.18

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv20791/CTest

Modified Files:
	cmCTestBuildAndTestHandler.cxx 
Log Message:
BUG: better passing of global TIMEOUT to internal ctest invocaitons


Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cmCTestBuildAndTestHandler.cxx	4 Jun 2007 17:39:43 -0000	1.17
+++ cmCTestBuildAndTestHandler.cxx	6 Jun 2007 15:02:24 -0000	1.18
@@ -218,8 +218,8 @@
     {
     this->BuildTargets.push_back("");
     }
-  for ( tarIt = this->BuildTargets.begin(); tarIt != this->BuildTargets.end();
-    ++ tarIt )
+  for ( tarIt = this->BuildTargets.begin(); 
+        tarIt != this->BuildTargets.end(); ++ tarIt )
     {
     double remainingTime = 0;
     if (this->Timeout)
@@ -332,19 +332,19 @@
   out << "\n";
 
   // how much time is remaining
-    double remainingTime = 0;
-    if (this->Timeout)
+  double remainingTime = 0;
+  if (this->Timeout)
+    {
+    remainingTime = this->Timeout - cmSystemTools::GetTime() + clock_start;
+    if (remainingTime <= 0)
       {
-      remainingTime = this->Timeout - cmSystemTools::GetTime() + clock_start;
-      if (remainingTime <= 0)
+      if(outstring)
         {
-        if(outstring)
-          {
-          *outstring = "--build-and-test timeout exceeded. ";
-          }
-        return 1;
+        *outstring = "--build-and-test timeout exceeded. ";
         }
+      return 1;
       }
+    }
   
   int runTestRes = this->CTest->RunTest(testCommand, &outs, &retval, 0, 
                                         remainingTime);