diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-27 12:13:48 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-27 08:14:21 -0400 |
| commit | 6fce0cbcab97cab1d190ccd915153fcfd156df5e (patch) | |
| tree | 834d45858ba472611761d3e346b1d8f402c3b5e7 /Source | |
| parent | 6e1079dfdbd2abec509c24a539c732e6f3a5fa31 (diff) | |
| parent | bbb62dcc72394316f151ead984a9f7cdc258e98f (diff) | |
| download | cmake-6fce0cbcab97cab1d190ccd915153fcfd156df5e.tar.gz | |
Merge topic 'ctest-repeat-notrun' into release-3.17
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 ec549606fd..58289ea50d 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -340,6 +340,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 |