summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-03-26 18:42:17 (GMT)
committerBrad King <brad.king@kitware.com>2020-03-26 18:42:17 (GMT)
commit3503a79639f66bf3d2644c3d5fc1f6d28ca639b8 (patch)
tree41fc55d73a533fc9dc538a8dbfbd1d9ad03b665e /Tests
parent4b266927c7556f74d11d6f499360d682117e0a60 (diff)
parent7fda917fa4897ec71c9a086f1f0fccae1c3d03d9 (diff)
downloadCMake-3503a79639f66bf3d2644c3d5fc1f6d28ca639b8.zip
CMake-3503a79639f66bf3d2644c3d5fc1f6d28ca639b8.tar.gz
CMake-3503a79639f66bf3d2644c3d5fc1f6d28ca639b8.tar.bz2
Merge branch 'backport-ctest-timeout-report' into ctest-timeout-report
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/CTestTimeout/Basic-stdout.txt2
-rw-r--r--Tests/RunCMake/CTestTimeout/Fork-stdout.txt2
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