diff options
| author | Brad King <brad.king@kitware.com> | 2023-10-02 12:57:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-10-02 12:57:35 (GMT) |
| commit | 832e88b208a41cd8b7660cbe3f0c168fd4f774f5 (patch) | |
| tree | b017f5ccc4a31087bc41a8d57ce1a7fe13ec1e1f /Tests/RunCMake | |
| parent | dd949c77cb94c59616bd288c10da6f315c1e1a52 (diff) | |
| parent | d267c128a232e9beb99576f901ee1b9291ba1480 (diff) | |
| download | CMake-832e88b208a41cd8b7660cbe3f0c168fd4f774f5.zip CMake-832e88b208a41cd8b7660cbe3f0c168fd4f774f5.tar.gz CMake-832e88b208a41cd8b7660cbe3f0c168fd4f774f5.tar.bz2 | |
Merge topic 'ctest-timeout-flag' into release-3.27
d267c128a2 ctest: Restore support for --timeout values higher than default test timeout
dd779a4bc2 Tests: Clarify RunCMake.CTestTimeout case name
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8851
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt (renamed from Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt) | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt b/Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt index 6e46485..f580871 100644 --- a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt +++ b/Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt @@ -1,5 +1,5 @@ Test project [^ -]*/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-build +]*/Tests/RunCMake/CTestTimeout/FlagOverridesVar-build Start 1: TestTimeout 1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec + diff --git a/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt b/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt new file mode 100644 index 0000000..aeeb3c9 --- /dev/null +++ b/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt @@ -0,0 +1,6 @@ +Test project [^ +]*/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-build + Start 1: TestTimeout +1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec ++ +100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake index 2f9eda1..470bbd8 100644 --- a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake @@ -92,5 +92,12 @@ block() set(TIMEOUT 4) set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT 10)\n") - run_ctest_timeout(PropertyOverridesScript) + run_ctest_timeout(PropertyOverridesVar) +endblock() + +block() + set(TIMEOUT 4) + set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") + set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT)\n") + run_ctest_timeout(FlagOverridesVar --timeout 10000001) endblock() |