summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-06-10 12:56:56 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-06-10 12:56:56 (GMT)
commitcf4ed391407370ff4148ea286ebf9360b9e7331f (patch)
treea265207c4a596544979bc816e1197f3ca2eca4e3 /Source
parent708828dc3761cc009f5ea479e6012ca1193e7e60 (diff)
downloadCMake-cf4ed391407370ff4148ea286ebf9360b9e7331f.zip
CMake-cf4ed391407370ff4148ea286ebf9360b9e7331f.tar.gz
CMake-cf4ed391407370ff4148ea286ebf9360b9e7331f.tar.bz2
ENH: Be more verbose
Diffstat (limited to 'Source')
-rw-r--r--Source/CTest/cmCTestBuildHandler.cxx20
-rw-r--r--Source/CTest/cmCTestConfigureHandler.cxx1
2 files changed, 21 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index cd74635..ce43bec 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -475,6 +475,11 @@ void cmCTestBuildHandler::GenerateDartBuildOutput(
m_CTest->EndXML(os);
}
+//######################################################################
+//######################################################################
+//######################################################################
+//######################################################################
+
//----------------------------------------------------------------------
int cmCTestBuildHandler::RunMakeCommand(const char* command,
int* retVal, const char* dir, int timeout, std::ofstream& ofs)
@@ -495,6 +500,14 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
}
argv.push_back(0);
+ cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "Run command:");
+ std::vector<const char*>::iterator ait;
+ for ( ait = argv.begin(); ait != argv.end(); ++ ait )
+ {
+ cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, " \"" << *ait << "\"");
+ }
+ cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, std::endl);
+
// Now create process object
cmsysProcess* cp = cmsysProcess_New();
cmsysProcess_SetCommand(cp, &*argv.begin());
@@ -553,6 +566,7 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
if(result == cmsysProcess_State_Exited)
{
*retVal = cmsysProcess_GetExitValue(cp);
+ cmCTestLog(m_CTest, HANDLER_VERBOSE_OUTPUT, "Command exited with the value: " << *retVal << std::endl);
}
else if(result == cmsysProcess_State_Exception)
{
@@ -575,6 +589,7 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
errorwarning.m_Error = true;
m_ErrorsAndWarnings.push_back(errorwarning);
m_TotalErrors ++;
+ cmCTestLog(this, ERROR_MESSAGE, "There was an error: " << cmsysProcess_GetErrorString(cp) << std::endl);
}
cmsysProcess_Delete(cp);
@@ -582,6 +597,11 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
return result;
}
+//######################################################################
+//######################################################################
+//######################################################################
+//######################################################################
+
//----------------------------------------------------------------------
void cmCTestBuildHandler::ProcessBuffer(const char* data, int length, size_t& tick, size_t tick_len,
std::ofstream& ofs)
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx
index e3cbf05..f5e8c97 100644
--- a/Source/CTest/cmCTestConfigureHandler.cxx
+++ b/Source/CTest/cmCTestConfigureHandler.cxx
@@ -66,6 +66,7 @@ int cmCTestConfigureHandler::ProcessHandler()
cmGeneratedFileStream ofs;
m_CTest->OpenOutputFile("Temporary", "LastConfigure.log", ofs);
+ cmCTestLog(m_CTest, HANDLER_VERBOSE_OUTPUT, "Configure with command: " << cCommand.c_str() << std::endl);
res = m_CTest->RunMakeCommand(cCommand.c_str(), &output,
&retVal, buildDirectory.c_str(),
0, ofs);