Browse Source

ENH: add more verbose output

Bill Hoffman 18 years ago
parent
commit
21b5c7d2b4
3 changed files with 16 additions and 0 deletions
  1. 3 0
      Source/CTest/cmCTestBuildCommand.cxx
  2. 3 0
      Source/CTest/cmCTestBuildHandler.cxx
  3. 10 0
      Source/cmCTest.cxx

+ 3 - 0
Source/CTest/cmCTestBuildCommand.cxx

@@ -97,6 +97,9 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
           cmakeProjectName,
           cmakeBuildAdditionalFlags, cmakeBuildTarget,
           cmakeBuildConfiguration, true, false);
+      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                 "SetMakeCommand:"
+                 << buildCommand.c_str() << "\n");
       this->CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str());
       }
     else

+ 3 - 0
Source/CTest/cmCTestBuildHandler.cxx

@@ -283,6 +283,9 @@ int cmCTestBuildHandler::ProcessHandler()
   // Determine build command and build directory
   const std::string &makeCommand
     = this->CTest->GetCTestConfiguration("MakeCommand");
+  cmCTestLog(this->CTest,
+             HANDLER_VERBOSE_OUTPUT, "MakeCommand:" << makeCommand << 
+             "\n");
   if ( makeCommand.size() == 0 )
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,

+ 10 - 0
Source/cmCTest.cxx

@@ -524,6 +524,8 @@ bool cmCTest::UpdateCTestConfiguration()
       fileName = this->BinaryDir + "/CTestConfiguration.ini";
       }
     }
+  cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "UpdateCTestConfiguration  from :"
+             << fileName.c_str() << "\n");
   if ( !cmSystemTools::FileExists(fileName.c_str()) )
     {
     // No need to exit if we are not producing XML
@@ -536,6 +538,8 @@ bool cmCTest::UpdateCTestConfiguration()
     }
   else
     {
+    cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "Parse Config file:" 
+               << fileName.c_str() << "\n");
     // parse the dart test file
     std::ifstream fin(fileName.c_str());
     if(!fin)
@@ -2243,6 +2247,9 @@ void cmCTest::EmptyCTestConfiguration()
 //----------------------------------------------------------------------
 void cmCTest::SetCTestConfiguration(const char *name, const char* value)
 {
+  cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "SetCTestConfiguration:"
+             << name << ":" << value << "\n");
+
   if ( !name )
     {
     return;
@@ -2358,6 +2365,9 @@ bool cmCTest::SetCTestConfigurationFromCMakeVariable(cmMakefile* mf,
     {
     return false;
     }
+  cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
+             "SetCTestConfigurationFromCMakeVariable:"
+             << dconfig << ":" << cmake_var);
   this->SetCTestConfiguration(dconfig, ctvar);
   return true;
 }