diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-09-24 13:49:46 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-09-24 13:49:46 (GMT) |
| commit | 65c418e56ffb29f889bd14fc363fb221a0827948 (patch) | |
| tree | cbbaba952c853535259a8944fc9b1756040c6b2d | |
| parent | f10929ae7ce3d62c7f49ffc9a98abf5d6b267b81 (diff) | |
| download | CMake-65c418e56ffb29f889bd14fc363fb221a0827948.zip CMake-65c418e56ffb29f889bd14fc363fb221a0827948.tar.gz CMake-65c418e56ffb29f889bd14fc363fb221a0827948.tar.bz2 | |
Reformat ctest -N output. Removed the "Start processing tests" message as well.
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 15 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index ea1c430..eca74fc 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -348,21 +348,24 @@ void cmCTestMultiProcessHandler::PrintTestList() testRun.SetTestProperties(&p); testRun.ComputeArguments(); //logs the command in verbose mode - cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(3) - << count << "/"); - cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(3) - << this->Total << " "); if (this->TestHandler->MemCheck) { - cmCTestLog(this->CTest, HANDLER_OUTPUT, "Memory Check"); + cmCTestLog(this->CTest, HANDLER_OUTPUT, " Memory Check"); } else { - cmCTestLog(this->CTest, HANDLER_OUTPUT, "Testing"); + cmCTestLog(this->CTest, HANDLER_OUTPUT, " Test"); } + cmOStringStream indexStr; + indexStr << " #" << p.Index << ":"; + cmCTestLog(this->CTest, HANDLER_OUTPUT, + std::setw(3 + getNumWidth(this->TestHandler->GetMaxIndex())) + << indexStr.str().c_str()); cmCTestLog(this->CTest, HANDLER_OUTPUT, " "); cmCTestLog(this->CTest, HANDLER_OUTPUT, p.Name.c_str() << std::endl); } + cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl << "Total Tests: " + << this->Total << std::endl); } //--------------------------------------------------------- diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index a8086b6..fcc3052 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -797,7 +797,7 @@ int cmCTest::ProcessTests() bool notest = true; int update_count = 0; - cmCTestLog(this, OUTPUT, "Start processing tests" << std::endl); + //cmCTestLog(this, OUTPUT, "Start processing tests" << std::endl); for(Part p = PartStart; notest && p != PartCount; p = Part(p+1)) { |