diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-07 13:14:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-07 13:14:48 (GMT) |
| commit | 18b1ccfa511d59c7a30e91da9a6cce99d2ebc50d (patch) | |
| tree | 7ab55d02266043f6e6df9a2d22c64fd305477189 /Source/cmCTest.cxx | |
| parent | 4c4e3c81eb957a992f7b6259796e188134876fc2 (diff) | |
| parent | 39cdc8afb93724de6145297b1a8e3335b2f40605 (diff) | |
| download | CMake-18b1ccfa511d59c7a30e91da9a6cce99d2ebc50d.zip CMake-18b1ccfa511d59c7a30e91da9a6cce99d2ebc50d.tar.gz CMake-18b1ccfa511d59c7a30e91da9a6cce99d2ebc50d.tar.bz2 | |
Merge topic 'ctest-progress-output-fixes'
39cdc8afb9 ctest: Make verbose mode override progress behavior
1bcd9b06b9 ctest: Don't treat skipped test as failed tests in progess report
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5663
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 6507f38..6c1071d 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2901,7 +2901,7 @@ bool cmCTest::GetFailover() const bool cmCTest::GetTestProgressOutput() const { - return this->Impl->TestProgressOutput; + return this->Impl->TestProgressOutput && !GetExtraVerbose(); } bool cmCTest::GetVerbose() const |