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:15 (GMT) |
| commit | 0613f1b24582ced108ac4697d542876ceada6201 (patch) | |
| tree | afd662da0df4f589397834d29fe366d8fdf48de9 /Tests | |
| parent | e50c02c009a86f88df53c0bddecea39073c29ba3 (diff) | |
| parent | 3503a79639f66bf3d2644c3d5fc1f6d28ca639b8 (diff) | |
| download | CMake-0613f1b24582ced108ac4697d542876ceada6201.zip CMake-0613f1b24582ced108ac4697d542876ceada6201.tar.gz CMake-0613f1b24582ced108ac4697d542876ceada6201.tar.bz2 | |
Merge topic 'ctest-timeout-report'
3503a79639 Merge branch 'backport-ctest-timeout-report' into ctest-timeout-report
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 |