mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-19 21:50:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'skip-return-code'

Browse Source 
3a0d164b allow to mark a test as "Not Run" with a specific return code (#8466)
This commit is contained in:
Brad King
2014-01-15 10:12:04 -05:00
committed by CMake Topic Stage
parent 4c7bac45ae 3a0d164bb2
commit c4e5e17f38
9 changed files with 77 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CTest/cmCTestRunTest.cxx
View File

@@ -206,7 +206,13 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
bool success =
!forceFail && (retVal == 0 ||
this->TestProperties->RequiredRegularExpressions.size());
if((success && !this->TestProperties->WillFail)
if(this->TestProperties->SkipReturnCode >= 0
&& this->TestProperties->SkipReturnCode == retVal)
{
this->TestResult.Status = cmCTestTestHandler::NOT_RUN;
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Skipped ");
}
else if((success && !this->TestProperties->WillFail)
|| (!success && this->TestProperties->WillFail))
{
this->TestResult.Status = cmCTestTestHandler::COMPLETED;

9
Source/CTest/cmCTestTestHandler.cxx
View File

@@ -2229,6 +2229,14 @@ bool cmCTestTestHandler::SetTestsProperties(
rtit->Processors = 1;
}
}
if ( key == "SKIP_RETURN_CODE" )
{
rtit->SkipReturnCode = atoi(val.c_str());
if(rtit->SkipReturnCode < 0 || rtit->SkipReturnCode > 255)
{
rtit->SkipReturnCode = -1;
}
}
if ( key == "DEPENDS" )
{
std::vector<std::string> lval;
@@ -2364,6 +2372,7 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
test.ExplicitTimeout = false;
test.Cost = 0;
test.Processors = 1;
test.SkipReturnCode = -1;
test.PreviousRuns = 0;
if (this->UseIncludeRegExpFlag &&
!this->IncludeTestsRegularExpression.find(testname.c_str()))

2
Source/CTest/cmCTestTestHandler.h
View File

@@ -109,6 +109,8 @@ public:
int Index;
//Requested number of process slots
int Processors;
// return code of test which will mark test as "not run"
int SkipReturnCode;
std::vector<std::string> Environment;
std::vector<std::string> Labels;
std::set<std::string> LockedResources;