kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: clean up the output some more

This commit is contained in:
Bill Hoffman 2004-01-09 14:14:24 -05:00
parent c47409d9e9
commit 00332a958e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmCTest.cxx
View File

@ -4030,7 +4030,7 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
// command line make program // command line make program
out << "Running make command: " << makeCommand.c_str() << " ...\n"; out << "Running make command: " << makeCommand.c_str() << "\n";
retVal = 0; retVal = 0;
std::string output; std::string output;
if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), &output, &retVal, 0, false)) if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), &output, &retVal, 0, false))
@ -4182,12 +4182,18 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
testCommand.push_back(0); testCommand.push_back(0);
std::string outs; std::string outs;
int retval = 0; int retval = 0;
out << "Running test executable: " << fullPath << "\n";
// run the test from the m_BuildRunDir if set // run the test from the m_BuildRunDir if set
if(m_BuildRunDir.size()) if(m_BuildRunDir.size())
{ {
out << "Run test in directory: " << m_BuildRunDir << "\n";
cmSystemTools::ChangeDirectory(m_BuildRunDir.c_str()); cmSystemTools::ChangeDirectory(m_BuildRunDir.c_str());
} }
out << "Running test executable: " << fullPath << " ";
for(k=0; k < m_TestCommandArgs.size(); ++k)
{
out << m_TestCommandArgs[k] << " ";
}
out << "\n";
this->RunTest(testCommand, &outs, &retval); this->RunTest(testCommand, &outs, &retval);
out << outs << "\n"; out << outs << "\n";
if(outstring) if(outstring)