summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestMultiProcessHandler.cxx
diff options
context:
space:
mode:
authorBetsy McPhail <betsy.mcphail@kitware.com>2017-03-27 18:08:50 (GMT)
committerBrad King <brad.king@kitware.com>2017-03-29 14:29:57 (GMT)
commitb070947dffd141d50227c59feed4c3d784b39157 (patch)
treeb9c83e19b826a4d01e0aba3df85f28bbd0f443ef /Source/CTest/cmCTestMultiProcessHandler.cxx
parent42c68aadf81a47d563392421636e14ef77644e03 (diff)
downloadCMake-b070947dffd141d50227c59feed4c3d784b39157.zip
CMake-b070947dffd141d50227c59feed4c3d784b39157.tar.gz
CMake-b070947dffd141d50227c59feed4c3d784b39157.tar.bz2
Add 'DISABLED' test property
When this property is set, the test is skipped and its status is automatically set to 'Not Run'. A disabled test will not be counted in the total number of tests and its completion status will be 'Disabled'.
Diffstat (limited to 'Source/CTest/cmCTestMultiProcessHandler.cxx')
-rw-r--r--Source/CTest/cmCTestMultiProcessHandler.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index ff465ab..2d4726c 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -163,7 +163,9 @@ void cmCTestMultiProcessHandler::StartTestProcess(int test)
this->TestRunningMap[test] = false;
this->RunningCount -= GetProcessorsUsed(test);
testRun->EndTest(this->Completed, this->Total, false);
- this->Failed->push_back(this->Properties[test]->Name);
+ if (!this->Properties[test]->Disabled) {
+ this->Failed->push_back(this->Properties[test]->Name);
+ }
delete testRun;
}
}