[cmake-commits] martink committed cmCTest.cxx 1.319 1.320

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx 
Log Message:
BUG: fix timeout bug with global timeouts such as DART_TESTING_TIMEOUT


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- cmCTest.cxx	6 Jun 2007 15:02:24 -0000	1.319
+++ cmCTest.cxx	8 Jun 2007 18:16:04 -0000	1.320
@@ -1098,7 +1098,8 @@
     {
     timeout = 1;
     }
-
+  cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
+             "Test timeout computed to be: " << timeout << "\n");
   if(cmSystemTools::SameFile(argv[0], this->CTestSelf.c_str()) &&
      !this->ForceNewCTestProcess)
     {
@@ -1113,7 +1114,7 @@
         // make sure we pass the timeout in for any build and test 
         // invocations. Since --build-generator is required this is a 
         // good place to check for it, and to add the arguments in
-        if (strcmp(argv[i],"--build-generator") == 0 && testTimeOut)
+        if (strcmp(argv[i],"--build-generator") == 0 && timeout)
           {
           args.push_back("--test-timeout");
           cmOStringStream msg;