diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2017-04-21 17:46:09 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2017-04-24 19:42:40 (GMT) |
| commit | ab8bbef9c6e588bc023ec8a773c78e33e3a61813 (patch) | |
| tree | 200afa2cf5cf3f07cfbba6f7a7b224c19e8e06d7 /Source/CTest | |
| parent | 202a44a4cab0ebf2c89fb878cd2ee634fb83906c (diff) | |
| download | CMake-ab8bbef9c6e588bc023ec8a773c78e33e3a61813.zip CMake-ab8bbef9c6e588bc023ec8a773c78e33e3a61813.tar.gz CMake-ab8bbef9c6e588bc023ec8a773c78e33e3a61813.tar.bz2 | |
cmCTestTestHandler: count skipped tests as disabled
The `Skipped` status is basically a runtime version of the `Disabled`
status (set as a property on the test by the configure step), so treat
them the same.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index dafeec2..f059ff1 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -17,6 +17,7 @@ #include <string.h> #include <time.h> +#include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestBatchTestHandler.h" #include "cmCTestMultiProcessHandler.h" @@ -495,7 +496,8 @@ int cmCTestTestHandler::ProcessHandler() for (SetOfTests::iterator ftit = resultsSet.begin(); ftit != resultsSet.end(); ++ftit) { - if (ftit->CompletionStatus == "Disabled") { + if (cmHasLiteralPrefix(ftit->CompletionStatus, "SKIP_RETURN_CODE=") || + ftit->CompletionStatus == "Disabled") { disabledTests.push_back(*ftit); } } @@ -544,6 +546,7 @@ int cmCTestTestHandler::ProcessHandler() for (SetOfTests::iterator ftit = resultsSet.begin(); ftit != resultsSet.end(); ++ftit) { if (ftit->Status != cmCTestTestHandler::COMPLETED && + !cmHasLiteralPrefix(ftit->CompletionStatus, "SKIP_RETURN_CODE=") && ftit->CompletionStatus != "Disabled") { ofs << ftit->TestCount << ":" << ftit->Name << std::endl; cmCTestLog( |