[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-639-g9ec9018

Kitware Robot kwrobot at kitware.com
Fri Mar 31 14:05:02 EDT 2017


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, next has been updated
       via  9ec90185a7b3f26951c87318808752d590028d9b (commit)
       via  716f8c88c9c94dc58f22ae770d613a4fec51c276 (commit)
      from  38bbe4194727fc94415c44be41fe8270ef12e0e9 (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=9ec90185a7b3f26951c87318808752d590028d9b
commit 9ec90185a7b3f26951c87318808752d590028d9b
Merge: 38bbe41 716f8c8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 31 18:00:26 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 31 14:00:28 2017 -0400

    Stage topic 'test-LinkInterfaceLoop-custom-timeout'
    
    Topic-id: 23430
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/651


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=716f8c88c9c94dc58f22ae770d613a4fec51c276
commit 716f8c88c9c94dc58f22ae770d613a4fec51c276
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 31 13:56:49 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 31 13:56:49 2017 -0400

    Tests: Add option to customize LinkInterfaceLoop timeout
    
    This test has a timeout in case CMake gets into an infinite loop.  The
    default of 90 seconds should be plenty of time for the test to run
    correctly since it does not actually do a build.  However, busy machines
    that run lots of tests in parallel may need a longer timeout.  Give them
    an option to extend it.

diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index c692cbd..d44c836 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -9,7 +9,14 @@ macro(add_CMakeOnly_test test)
 endmacro()
 
 add_CMakeOnly_test(LinkInterfaceLoop)
-set_property(TEST CMakeOnly.LinkInterfaceLoop PROPERTY TIMEOUT 90)
+# If a bug is introduced in CMake that causes an infinite loop while
+# analyzing LinkInterfaceLoop then don't let the test run too long.
+# Use an option to customize it so that the timeout can be extended
+# on busy machines.
+if(NOT DEFINED CMake_TEST_CMakeOnly.LinkInterfaceLoop_TIMEOUT)
+  set(CMake_TEST_CMakeOnly.LinkInterfaceLoop_TIMEOUT 90)
+endif()
+set_property(TEST CMakeOnly.LinkInterfaceLoop PROPERTY TIMEOUT ${CMake_TEST_CMakeOnly.LinkInterfaceLoop_TIMEOUT})
 
 add_CMakeOnly_test(CheckSymbolExists)
 

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeOnly/CMakeLists.txt |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list