This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 57db062414d0ae711a6e66c9eef69eabaa8fee6f (commit)
via 30e79bb4a388b59c5851b949a0dd559bc57e8ad3 (commit)
from b089396f8e60c7a4a9e5fbece8484e7e77fd503a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57db062414d0ae711a6e66c9eef69eabaa8fee6f
commit 57db062414d0ae711a6e66c9eef69eabaa8fee6f
Merge: b089396f8e 30e79bb4a3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 5 15:55:31 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 5 10:55:41 2019 -0500
Merge topic 'ctest-repeat-until-pass'
30e79bb4a3 Tests: Extend RunCMake.CTestCommandLine internal timeout for
valgrind
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3987
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30e79bb4a388b59c5851b949a0dd559bc57e8ad3
commit 30e79bb4a388b59c5851b949a0dd559bc57e8ad3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 4 11:21:38 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 4 11:22:58 2019 -0500
Tests: Extend RunCMake.CTestCommandLine internal timeout for valgrind
A case added by commit 39ac8b4eb5 (ctest: Add --repeat-after-timeout
option, 2019-10-29) includes a success-case timeout of 2 seconds. That
is too short when running under valgrind, so extend it to 5 seconds.
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake
b/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake
index 4dc9c3648f..873c0bd6fb 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake
+++ b/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake
@@ -9,7 +9,7 @@ add_test(NAME test1
COMMAND ${CMAKE_COMMAND}
"-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/test1-timeout.cmake")
-set_tests_properties(test1 PROPERTIES DEPENDS "initialization" TIMEOUT 2)
+set_tests_properties(test1 PROPERTIES DEPENDS "initialization" TIMEOUT 5)
add_test(hello ${CMAKE_COMMAND} -E echo hello)
add_test(goodbye ${CMAKE_COMMAND} -E echo goodbye)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
