[Cmake-commits] [cmake-commits] hoffman committed cmCTestMultiProcessHandler.cxx 1.5 1.6 cmCTestTestHandler.cxx 1.100 1.101 cmProcess.h 1.3 1.4

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestMultiProcessHandler.cxx cmCTestTestHandler.cxx 
	cmProcess.h 
Log Message:
Output total time when using -j N


Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmCTestMultiProcessHandler.cxx	24 Feb 2009 22:23:51 -0000	1.5
--- cmCTestMultiProcessHandler.cxx	12 Aug 2009 02:02:49 -0000	1.6
***************
*** 249,253 ****
    cmCTestTestHandler::cmCTestTestResult cres;
    cres.Properties = 0;
!   cres.ExecutionTime = 0;// ???
    cres.ReturnValue = exitVal;
    cres.Status = cmCTestTestHandler::COMPLETED;
--- 249,253 ----
    cmCTestTestHandler::cmCTestTestResult cres;
    cres.Properties = 0;
!   cres.ExecutionTime = p->GetTotalTime();
    cres.ReturnValue = exitVal;
    cres.Status = cmCTestTestHandler::COMPLETED;

Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.100
retrieving revision 1.101
diff -C 2 -d -r1.100 -r1.101
*** cmCTestTestHandler.cxx	28 Jul 2009 14:46:50 -0000	1.100
--- cmCTestTestHandler.cxx	12 Aug 2009 02:02:49 -0000	1.101
***************
*** 593,597 ****
        char buf[1024];
        sprintf(buf, "%6.2f sec", totalTestTime); 
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nTotal CPU time = " 
                   <<  buf << "\n" );
        
--- 593,597 ----
        char buf[1024];
        sprintf(buf, "%6.2f sec", totalTestTime); 
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nTotal Test time = " 
                   <<  buf << "\n" );
        

Index: cmProcess.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmProcess.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmProcess.h	29 Dec 2008 22:49:17 -0000	1.3
--- cmProcess.h	12 Aug 2009 02:02:49 -0000	1.4
***************
*** 54,57 ****
--- 54,58 ----
    void SetId(int id) { this->Id = id;}
    int GetExitValue() { return this->ExitValue;}
+   double GetTotalTime() { return this->TotalTime;}
  private:
    int LastOutputPipe;