[cmake-commits] hoffman committed cmCTestBuildAndTestHandler.cxx 1.19 1.20 cmCTestBuildCommand.cxx 1.17 1.18 cmCTestTestHandler.cxx 1.56 1.57

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestBuildAndTestHandler.cxx cmCTestBuildCommand.cxx 
	cmCTestTestHandler.cxx 
Log Message:
ENH: fix build issue with config type not being specified by ctest


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- cmCTestTestHandler.cxx	11 Sep 2007 15:21:36 -0000	1.56
+++ cmCTestTestHandler.cxx	17 Sep 2007 14:40:57 -0000	1.57
@@ -1206,6 +1206,18 @@
       return path;
       }
     }
+  if(fullPath.size() == 0)
+    {
+    cmCTestLog(ctest, HANDLER_OUTPUT,
+               "Could not find executable " << testCommand << "\n"
+               << "Looked in the following places:\n");
+    for(std::vector<std::string>::iterator i = failed.begin();
+        i != failed.end(); ++i)
+      {
+      cmCTestLog(ctest, HANDLER_OUTPUT,
+                 i->c_str() << "\n");
+      }
+    }
   
   return fullPath;
 }

Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cmCTestBuildAndTestHandler.cxx	11 Sep 2007 18:43:17 -0000	1.19
+++ cmCTestBuildAndTestHandler.cxx	17 Sep 2007 14:40:57 -0000	1.20
@@ -264,7 +264,6 @@
       config,
       !this->BuildNoClean, 
       false, remainingTime);
-
     out << output;
     // if the build failed then return
     if (retVal)

Index: cmCTestBuildCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildCommand.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cmCTestBuildCommand.cxx	14 Jun 2007 17:05:09 -0000	1.17
+++ cmCTestBuildCommand.cxx	17 Sep 2007 14:40:57 -0000	1.18
@@ -92,11 +92,25 @@
       this->GlobalGenerator->FindMakeProgram(this->Makefile);
       const char* cmakeMakeProgram
         = this->Makefile->GetDefinition("CMAKE_MAKE_PROGRAM");
+      if(strlen(cmakeBuildConfiguration) == 0)
+        {
+        const char* config = 0;
+#ifdef CMAKE_INTDIR
+        config = CMAKE_INTDIR;
+#endif
+        if(!config)
+          {
+          config = "Debug";
+          }
+        cmakeBuildConfiguration = config;
+        }
+      
       std::string buildCommand
-        = this->GlobalGenerator->GenerateBuildCommand(cmakeMakeProgram,
-          cmakeProjectName,
-          cmakeBuildAdditionalFlags, cmakeBuildTarget,
-          cmakeBuildConfiguration, true, false);
+        = this->GlobalGenerator->
+        GenerateBuildCommand(cmakeMakeProgram,
+                             cmakeProjectName,
+                             cmakeBuildAdditionalFlags, cmakeBuildTarget,
+                             cmakeBuildConfiguration, true, false);
       cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                  "SetMakeCommand:"
                  << buildCommand.c_str() << "\n");