[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestRunTest.cxx 1.23 1.24

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestRunTest.cxx 
Log Message:
BUG: 0009612: --output-on-failure option doesn't work with the new parallel CTest handler


Index: cmCTestRunTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunTest.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** cmCTestRunTest.cxx	28 Sep 2009 15:43:02 -0000	1.23
--- cmCTestRunTest.cxx	29 Sep 2009 13:45:43 -0000	1.24
***************
*** 82,85 ****
--- 82,86 ----
      std::string> >::iterator passIt;
    bool forceFail = false;
+   bool outputTestErrorsToConsole = false;
    if ( this->TestProperties->RequiredRegularExpressions.size() > 0 )
      {
***************
*** 141,144 ****
--- 142,146 ----
        this->TestResult.Status = cmCTestTestHandler::FAILED;
        cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Failed  " << reason );
+       outputTestErrorsToConsole = this->CTest->OutputTestOutputOnTestFailure;
        }
      }
***************
*** 147,153 ****
--- 149,157 ----
      cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Timeout");
      this->TestResult.Status = cmCTestTestHandler::TIMEOUT;
+     outputTestErrorsToConsole = this->CTest->OutputTestOutputOnTestFailure;
      }
    else if ( res == cmsysProcess_State_Exception )
      {
+     outputTestErrorsToConsole = this->CTest->OutputTestOutputOnTestFailure;
      cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Exception: ");
      switch ( retVal )
***************
*** 184,187 ****
--- 188,197 ----
    sprintf(buf, "%6.2f sec", this->TestProcess->GetTotalTime());
    cmCTestLog(this->CTest, HANDLER_OUTPUT, buf << "\n" );
+ 
+   if ( outputTestErrorsToConsole )
+     {
+     cmCTestLog(this->CTest, HANDLER_OUTPUT, this->ProcessOutput << std::endl );
+     }
+ 
    if ( this->TestHandler->LogFile )
      {