diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-27 12:13:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-27 12:14:21 (GMT) |
| commit | 6fac882730559828cea603d2715c8a94f34c146a (patch) | |
| tree | 8e7f8ed97827b026d77bad4ccdb099ef9eadca96 /Source | |
| parent | e53173f4f89674eab7aeca21fe83e7ce3840c4e1 (diff) | |
| parent | 0a74d7c2b84c9c8f87f4d821d3f0cd5bd8a7f479 (diff) | |
| download | CMake-6fac882730559828cea603d2715c8a94f34c146a.zip CMake-6fac882730559828cea603d2715c8a94f34c146a.tar.gz CMake-6fac882730559828cea603d2715c8a94f34c146a.tar.bz2 | |
Merge topic 'ctest-repeat-notrun'
0a74d7c2b8 Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrun
bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log
c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4801
Diffstat (limited to 'Source')
| -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 |