kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Reports "Passed" for WILL_FAIL tests 

Previously tests marked with WILL_FAIL have been reported by CTest as

  ...............***Failed  - supposed to fail

when they correctly failed.  Now we just report ".....Passed" because
there is no reason to draw attention to something that works as
expected.
This commit is contained in:
Brad King 2009-07-02 16:13:55 -04:00
parent 2247153110
commit 5b51ad580b
1 changed files with 51 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
Source/CTest/cmCTestTestHandler.cxx
View File

@ -768,7 +768,6 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
std::string reason; std::string reason;
if ( !this->CTest->GetShowOnly() ) if ( !this->CTest->GetShowOnly() )
{ {
bool testFailed = false;
std::vector<std::pair<cmsys::RegularExpression, std::vector<std::pair<cmsys::RegularExpression,
std::string> >::iterator passIt; std::string> >::iterator passIt;
bool forceFail = false; bool forceFail = false;
@ -817,87 +816,69 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
} }
} }
if (res == cmsysProcess_State_Exited && if (res == cmsysProcess_State_Exited)
(retVal == 0 || it->RequiredRegularExpressions.size()) &&
!forceFail)
{ {
cmCTestLog(this->CTest, HANDLER_OUTPUT, " Passed"); bool success =
if ( it->WillFail ) !forceFail && (retVal == 0 || it->RequiredRegularExpressions.size());
if((success && !it->WillFail) || (!success && it->WillFail))
{ {
cmCTestLog(this->CTest, HANDLER_OUTPUT, " - But it should fail!"); cres.Status = cmCTestTestHandler::COMPLETED;
cres.Status = cmCTestTestHandler::FAILED; cmCTestLog(this->CTest, HANDLER_OUTPUT, " Passed" << std::endl);
testFailed = true;
} }
else else
{ {
cres.Status = cmCTestTestHandler::COMPLETED; cres.Status = cmCTestTestHandler::FAILED;
cmCTestLog(this->CTest, HANDLER_OUTPUT,
"***Failed " << reason << std::endl);
}
}
else if ( res == cmsysProcess_State_Expired )
{
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Timeout" << std::endl);
cres.Status = cmCTestTestHandler::TIMEOUT;
}
else if ( res == cmsysProcess_State_Exception )
{
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Exception: ");
switch ( retVal )
{
case cmsysProcess_Exception_Fault:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "SegFault");
cres.Status = cmCTestTestHandler::SEGFAULT;
break;
case cmsysProcess_Exception_Illegal:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Illegal");
cres.Status = cmCTestTestHandler::ILLEGAL;
break;
case cmsysProcess_Exception_Interrupt:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Interrupt");
cres.Status = cmCTestTestHandler::INTERRUPT;
break;
case cmsysProcess_Exception_Numerical:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Numerical");
cres.Status = cmCTestTestHandler::NUMERICAL;
break;
default:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Other");
cres.Status = cmCTestTestHandler::OTHER_FAULT;
} }
cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl); cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
} }
else else // if ( res == cmsysProcess_State_Error )
{ {
testFailed = true; cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Bad command " << res
<< std::endl);
cres.Status = cmCTestTestHandler::BAD_COMMAND;
}
cres.Status = cmCTestTestHandler::FAILED; if(cres.Status == cmCTestTestHandler::COMPLETED)
if ( res == cmsysProcess_State_Expired )
{
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Timeout" << std::endl);
cres.Status = cmCTestTestHandler::TIMEOUT;
}
else if ( res == cmsysProcess_State_Exception )
{
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Exception: ");
switch ( retVal )
{
case cmsysProcess_Exception_Fault:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "SegFault");
cres.Status = cmCTestTestHandler::SEGFAULT;
break;
case cmsysProcess_Exception_Illegal:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Illegal");
cres.Status = cmCTestTestHandler::ILLEGAL;
break;
case cmsysProcess_Exception_Interrupt:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Interrupt");
cres.Status = cmCTestTestHandler::INTERRUPT;
break;
case cmsysProcess_Exception_Numerical:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Numerical");
cres.Status = cmCTestTestHandler::NUMERICAL;
break;
default:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Other");
cres.Status = cmCTestTestHandler::OTHER_FAULT;
}
cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
}
else if ( res == cmsysProcess_State_Error )
{
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Bad command " << res
<< std::endl);
cres.Status = cmCTestTestHandler::BAD_COMMAND;
}
else
{
// Force fail will also be here?
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Failed " << reason);
if ( it->WillFail )
{
cres.Status = cmCTestTestHandler::COMPLETED;
cmCTestLog(this->CTest, HANDLER_OUTPUT, " - supposed to fail");
testFailed = false;
}
cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
}
}
if ( testFailed )
{
failed.push_back(testname);
}
else
{ {
passed.push_back(testname); passed.push_back(testname);
} }
else
{
failed.push_back(testname);
}
if (!output.empty() && output.find("<DartMeasurement") != output.npos) if (!output.empty() && output.find("<DartMeasurement") != output.npos)
{ {
if (this->DartStuff.find(output.c_str())) if (this->DartStuff.find(output.c_str()))