diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-26 18:25:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-03-26 18:35:54 (GMT) |
| commit | 7fda917fa4897ec71c9a086f1f0fccae1c3d03d9 (patch) | |
| tree | 11f3dc65aa18d0089efb82ae3ab721d28c3bc2a4 /Tests/RunCMake/CTestTimeout | |
| parent | e3185e3d1b92a95c18f22f70b3cef6944dd019eb (diff) | |
| download | CMake-7fda917fa4897ec71c9a086f1f0fccae1c3d03d9.zip CMake-7fda917fa4897ec71c9a086f1f0fccae1c3d03d9.tar.gz CMake-7fda917fa4897ec71c9a086f1f0fccae1c3d03d9.tar.bz2 | |
CTest: Fix reported duration on timeout when grindchild keeps pipes open
Since commit d1976cd1f2 (CTest: Fix timeout when grandchild keeps pipes
open, 2020-01-13, v3.17.0-rc1~169^2) we no longer hang, but the test
duration we report after the timeout is the amount of time the immediate
child ran before exiting. Fix the logic to instead report the actual
amount of time we spent monitoring the test before the timeout.
Fixes: #20509
Diffstat (limited to 'Tests/RunCMake/CTestTimeout')
| -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 |