summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-01-09 19:14:24 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-01-09 19:14:24 (GMT)
commit00332a958eed520c050ca6bf568f6e2491d8d2de (patch)
tree4ac6168e4bf487cb95cbb882d9f10defa10bef96
parentc47409d9e9caefccb821eca045a2e1c115e23554 (diff)
downloadCMake-00332a958eed520c050ca6bf568f6e2491d8d2de.zip
CMake-00332a958eed520c050ca6bf568f6e2491d8d2de.tar.gz
CMake-00332a958eed520c050ca6bf568f6e2491d8d2de.tar.bz2
ENH: clean up the output some more
-rw-r--r--Source/cmCTest.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 7864020..70c02bd 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -4030,7 +4030,7 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
// command line make program
- out << "Running make command: " << makeCommand.c_str() << " ...\n";
+ out << "Running make command: " << makeCommand.c_str() << "\n";
retVal = 0;
std::string output;
if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), &output, &retVal, 0, false))
@@ -4182,12 +4182,18 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
testCommand.push_back(0);
std::string outs;
int retval = 0;
- out << "Running test executable: " << fullPath << "\n";
// run the test from the m_BuildRunDir if set
if(m_BuildRunDir.size())
{
+ out << "Run test in directory: " << m_BuildRunDir << "\n";
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);
out << outs << "\n";
if(outstring)