diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-27 10:45:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-05-27 10:45:39 (GMT) |
| commit | 0a74d7c2b84c9c8f87f4d821d3f0cd5bd8a7f479 (patch) | |
| tree | be63ba6b56160a20e8c27b9681566b6156e7abb5 /Source/CTest/cmCTestRunTest.cxx | |
| parent | 614e93c563c977b68e37399d09d28d58672166d4 (diff) | |
| parent | bbb62dcc72394316f151ead984a9f7cdc258e98f (diff) | |
| download | CMake-0a74d7c2b84c9c8f87f4d821d3f0cd5bd8a7f479.zip CMake-0a74d7c2b84c9c8f87f4d821d3f0cd5bd8a7f479.tar.gz CMake-0a74d7c2b84c9c8f87f4d821d3f0cd5bd8a7f479.tar.bz2 | |
Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrun
Diffstat (limited to 'Source/CTest/cmCTestRunTest.cxx')
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index ba7d47e..2c8e385 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -344,6 +344,11 @@ bool cmCTestRunTest::NeedsToRepeat() if (this->NumberOfRunsLeft == 0) { return false; } + // If a test is marked as NOT_RUN it will not be repeated + // no matter the repeat settings, so just record it as-is. + if (this->TestResult.Status == cmCTestTestHandler::NOT_RUN) { + return false; + } // if number of runs left is not 0, and we are running until // we find a failed (or passed) test, then return true so the test can be // restarted |