diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:45:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 11:46:14 (GMT) |
| commit | b835c5d5c9a02add46d6fd3c0ec20587d27bb3be (patch) | |
| tree | 737fe45819bc345e51c31953ca8c68837e8f932e /Tests | |
| parent | efb2a9f0938ea518177ad33d04186bdcfb87d7a9 (diff) | |
| parent | 7fda917fa4897ec71c9a086f1f0fccae1c3d03d9 (diff) | |
| download | CMake-b835c5d5c9a02add46d6fd3c0ec20587d27bb3be.zip CMake-b835c5d5c9a02add46d6fd3c0ec20587d27bb3be.tar.gz CMake-b835c5d5c9a02add46d6fd3c0ec20587d27bb3be.tar.bz2 | |
Merge topic 'ctest-timeout-report' into release-3.17
7fda917fa4 CTest: Fix reported duration on timeout when grindchild keeps pipes open
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4530
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/Basic-stdout.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/Fork-stdout.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CTestTimeout/Basic-stdout.txt b/Tests/RunCMake/CTestTimeout/Basic-stdout.txt index 30ed178..db59dbf 100644 --- a/Tests/RunCMake/CTestTimeout/Basic-stdout.txt +++ b/Tests/RunCMake/CTestTimeout/Basic-stdout.txt @@ -1,6 +1,6 @@ Test project [^ ]*/Tests/RunCMake/CTestTimeout/Basic-build Start 1: TestTimeout -1/1 Test #1: TestTimeout ......................\*\*\*Timeout +[0-9.]+ sec +1/1 Test #1: TestTimeout ......................\*\*\*Timeout +[1-9][0-9.]* sec + 0% tests passed, 1 tests failed out of 1 diff --git a/Tests/RunCMake/CTestTimeout/Fork-stdout.txt b/Tests/RunCMake/CTestTimeout/Fork-stdout.txt index 284e4b1..2938d8e 100644 --- a/Tests/RunCMake/CTestTimeout/Fork-stdout.txt +++ b/Tests/RunCMake/CTestTimeout/Fork-stdout.txt @@ -1,6 +1,6 @@ Test project [^ ]*/Tests/RunCMake/CTestTimeout/Fork-build Start 1: TestTimeout -1/1 Test #1: TestTimeout ......................\*\*\*Timeout +[0-9.]+ sec +1/1 Test #1: TestTimeout ......................\*\*\*Timeout +[1-9][0-9.]* sec + 0% tests passed, 1 tests failed out of 1 |