[cmake-commits] martink committed cmCTest.cxx 1.317 1.318

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx 
Log Message:
ENH: fix passing of time limit to some ctest invocations that also use build-options


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -d -r1.317 -r1.318
--- cmCTest.cxx	23 Mar 2007 20:33:47 -0000	1.317
+++ cmCTest.cxx	4 Jun 2007 17:39:43 -0000	1.318
@@ -1094,8 +1094,10 @@
       {
       if(argv[i])
         {
-        // if this test has a test command make sure we pass the timeout in
-        if (strcmp(argv[i],"--test-command") == 0 && testTimeOut)
+        // 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)
           {
           args.push_back("--test-timeout");
           cmOStringStream msg;