diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-03-14 13:16:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-15 11:36:42 (GMT) |
| commit | 96fdde26bbbc969944e556ad649191cd21f46990 (patch) | |
| tree | 0304a27601c4392c7f0a88527c4b0c6fc37d8cc0 /Tests/RunCMake/GoogleTest/GoogleTest-timeout-stdout.txt | |
| parent | c1e087a9d3af74299d7681c9f9de59e5977a1539 (diff) | |
| download | CMake-96fdde26bbbc969944e556ad649191cd21f46990.zip CMake-96fdde26bbbc969944e556ad649191cd21f46990.tar.gz CMake-96fdde26bbbc969944e556ad649191cd21f46990.tar.bz2 | |
GoogleTest: Rename TIMEOUT parameter to avoid clash
In gtest_discover_tests(), the TIMEOUT keyword was making it
impossible to set the TIMEOUT test property via the PROPERTIES
keyword. This would be a frequent case, but it doesn't complain
and instead silently does something different to what would
normally be expected. The TIMEOUT keyword has been renamed
to DISCOVERY_TIMEOUT, thereby removing the clash.
This is a breaking change. 3.10.1 and 3.10.2 were the only versions
that supported the TIMEOUT keyword and uses of it were likely
not working as intended.
Fixes: #17801
Diffstat (limited to 'Tests/RunCMake/GoogleTest/GoogleTest-timeout-stdout.txt')
| -rw-r--r-- | Tests/RunCMake/GoogleTest/GoogleTest-timeout-stdout.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-timeout-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-timeout-stdout.txt deleted file mode 100644 index 8464c80..0000000 --- a/Tests/RunCMake/GoogleTest/GoogleTest-timeout-stdout.txt +++ /dev/null @@ -1,7 +0,0 @@ -( *|[0-9]+>)CMake Error at .*GoogleTestAddTests.cmake:[0-9]+ \(message\): -( *|[0-9]+>) Error running test executable. -?( *|[0-9]+>) -( *|[0-9]+>) Path: '.*timeout_test(\.exe)?' -( *|[0-9]+>) Result: Process terminated due to timeout -( *|[0-9]+>) Output: -( *|[0-9]+>) + |