[cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.55 1.56

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Sep 11 11:21:38 EDT 2007


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

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
ENH: fix 2 ctest issues, do not use the build type of ctest to look for config types, do not inherit pipes in child procs for ctest so it can kill them


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- cmCTestTestHandler.cxx	25 Jul 2007 20:37:50 -0000	1.55
+++ cmCTestTestHandler.cxx	11 Sep 2007 15:21:36 -0000	1.56
@@ -1090,16 +1090,6 @@
     {
     // no config specified to try some options
     tempPath = filepath;
-    tempPath += "Deployment/";
-    tempPath += filename;
-    attempted.push_back(tempPath);
-    attemptedConfigs.push_back("Deployment");
-    tempPath = filepath;
-    tempPath += "Development/";
-    tempPath += filename;
-    attempted.push_back(tempPath);
-    attemptedConfigs.push_back("Deployment");
-    tempPath = filepath;
     tempPath += "Release/";
     tempPath += filename;
     attempted.push_back(tempPath);
@@ -1119,6 +1109,16 @@
     tempPath += filename;
     attempted.push_back(tempPath);    
     attemptedConfigs.push_back("RelWithDebInfo");
+    tempPath = filepath;
+    tempPath += "Deployment/";
+    tempPath += filename;
+    attempted.push_back(tempPath);
+    attemptedConfigs.push_back("Deployment");
+    tempPath = filepath;
+    tempPath += "Development/";
+    tempPath += filename;
+    attempted.push_back(tempPath);
+    attemptedConfigs.push_back("Deployment");
     }
 }
 



More information about the Cmake-commits mailing list