diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-27 12:53:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-27 12:55:40 (GMT) |
| commit | ef205e04d4b06b4cc1456c2bca91d3859e5cb85c (patch) | |
| tree | a9d3b28b2ed3b16c17be02ee012e48914111ed70 /Tests/RunCMake/ctest_disabled_test/DisableSetupTest-stdout.txt | |
| parent | 5081dfca8332957a4894bce0653c86ba1b7b2bfe (diff) | |
| parent | 851b6c1595363c8916f24b7da8db991cf6fc3f25 (diff) | |
| download | CMake-ef205e04d4b06b4cc1456c2bca91d3859e5cb85c.zip CMake-ef205e04d4b06b4cc1456c2bca91d3859e5cb85c.tar.gz CMake-ef205e04d4b06b4cc1456c2bca91d3859e5cb85c.tar.bz2 | |
Merge topic 'ctest_test-ignore-skipped-tests'
851b6c15 cmCTestTestHandler: indicate why a test did not run
25a7f14f Help: add release notes
ab8bbef9 cmCTestTestHandler: count skipped tests as disabled
202a44a4 cmCTestRunTest: do not count skipped tests as failed
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !741
Diffstat (limited to 'Tests/RunCMake/ctest_disabled_test/DisableSetupTest-stdout.txt')
| -rw-r--r-- | Tests/RunCMake/ctest_disabled_test/DisableSetupTest-stdout.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/ctest_disabled_test/DisableSetupTest-stdout.txt b/Tests/RunCMake/ctest_disabled_test/DisableSetupTest-stdout.txt index dc27950..2dfd10d 100644 --- a/Tests/RunCMake/ctest_disabled_test/DisableSetupTest-stdout.txt +++ b/Tests/RunCMake/ctest_disabled_test/DisableSetupTest-stdout.txt @@ -9,5 +9,5 @@ + Total Test time \(real\) = +[0-9.]+ sec + -The following tests are disabled and did not run: -.*2 \- DisabledTest +The following tests did not run: +.*2 \- DisabledTest \(Disabled\) |