[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestRunTest.cxx 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv4307

Modified Files:
	cmCTestRunTest.cxx 
Log Message:
ENH: Improved test reporting output


Index: cmCTestRunTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunTest.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** cmCTestRunTest.cxx	31 Aug 2009 13:50:33 -0000	1.9
--- cmCTestRunTest.cxx	1 Sep 2009 15:58:04 -0000	1.10
***************
*** 430,439 ****
  void cmCTestRunTest::WriteLogOutputTop(size_t completed, size_t total)
  {
!   /* Not sure whether we want to prepend the test index anymore
!   cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(3)
!              << this->Index << ": ");*/
!   cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(3) 
               << completed << "/");
!   cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(3) 
               << total << " ");
  
--- 430,445 ----
  void cmCTestRunTest::WriteLogOutputTop(size_t completed, size_t total)
  {
!   int numWidth = 1;
!   if(total >= 10)
!     {
!     numWidth = 2;
!     }
!   if(total >= 100)
!     {
!     numWidth = 3;
!     }
!   cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(numWidth)
               << completed << "/");
!   cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(numWidth)
               << total << " ");
  
***************
*** 444,453 ****
    else
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "Testing");
      }
  
    cmOStringStream indexStr;
!   indexStr << " (" << this->Index << ")";
!   cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(6) 
               << indexStr.str().c_str());
    cmCTestLog(this->CTest, HANDLER_OUTPUT, " ");
--- 450,459 ----
    else
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "Test");
      }
  
    cmOStringStream indexStr;
!   indexStr << " #" << this->Index << ":";
!   cmCTestLog(this->CTest, HANDLER_OUTPUT, std::setw(3 + numWidth) 
               << indexStr.str().c_str());
    cmCTestLog(this->CTest, HANDLER_OUTPUT, " ");