Attached Files | cmake-2.8.0-rc1+fix_output_on_failure_regression.diff [^] (1,844 bytes) 2009-09-28 17:49 [Show Content] [Hide Content]diff -ur cmake-2.8.0-rc1.ORIG/Source/CTest/cmCTestRunTest.cxx cmake-2.8.0-rc1/Source/CTest/cmCTestRunTest.cxx
--- cmake-2.8.0-rc1.ORIG/Source/CTest/cmCTestRunTest.cxx 2009-09-25 14:29:34.000000000 -0400
+++ cmake-2.8.0-rc1/Source/CTest/cmCTestRunTest.cxx 2009-09-28 17:37:10.000000000 -0400
@@ -86,6 +86,7 @@
std::vector<std::pair<cmsys::RegularExpression,
std::string> >::iterator passIt;
bool forceFail = false;
+ bool outputTestErrorsToConsole = false;
if ( this->TestProperties->RequiredRegularExpressions.size() > 0 )
{
bool found = false;
@@ -145,15 +146,27 @@
{
this->TestResult.Status = cmCTestTestHandler::FAILED;
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Failed " << reason );
+ if(this->CTest->OutputTestOutputOnTestFailure)
+ {
+ outputTestErrorsToConsole = true;
+ }
}
}
else if ( res == cmsysProcess_State_Expired )
{
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Timeout");
this->TestResult.Status = cmCTestTestHandler::TIMEOUT;
+ if(this->CTest->OutputTestOutputOnTestFailure)
+ {
+ outputTestErrorsToConsole = true;
+ }
}
else if ( res == cmsysProcess_State_Exception )
{
+ if(this->CTest->OutputTestOutputOnTestFailure)
+ {
+ outputTestErrorsToConsole = true;
+ }
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Exception: ");
switch ( retVal )
{
@@ -188,6 +201,12 @@
char buf[1024];
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 )
{
*this->TestHandler->LogFile << "Test time = " << buf << std::endl;
|