[Cmake-commits] CMake branch, next, updated. v3.2.1-1803-g1442548

[Brad King]

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  14425486989dc3a724c3ff126725e10de7479751 (commit)
       via  bb2a42aeca46c993f1a8790aadfa0e86d5e30f9b (commit)
      from  5d39d4938f497130b59a9a8caeeb130ed7851cec (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14425486989dc3a724c3ff126725e10de7479751
commit 14425486989dc3a724c3ff126725e10de7479751
Merge: 5d39d49 bb2a42a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 09:37:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 13 09:37:01 2015 -0400

    Merge topic 'FindMatlab-test-timeout' into next
    
    bb2a42ae Tests: Increasing the stability of the FindMatlab.basic_checks test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb2a42aeca46c993f1a8790aadfa0e86d5e30f9b
commit bb2a42aeca46c993f1a8790aadfa0e86d5e30f9b
Author:     Raffi Enficiaud <raffi.enficiaud at tuebingen.mpg.de>
AuthorDate: Fri Apr 10 22:52:16 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 13 09:36:13 2015 -0400

    Tests: Increasing the stability of the FindMatlab.basic_checks test
    
    Increase the timeout to tolerate longer network delays.

diff --git a/Tests/FindMatlab/basic_checks/CMakeLists.txt b/Tests/FindMatlab/basic_checks/CMakeLists.txt
index acf71ea..bf54427 100644
--- a/Tests/FindMatlab/basic_checks/CMakeLists.txt
+++ b/Tests/FindMatlab/basic_checks/CMakeLists.txt
@@ -24,7 +24,7 @@ matlab_add_mex(
 
 matlab_add_unit_test(
     NAME ${PROJECT_NAME}_matlabtest-1
-    TIMEOUT 30
+    TIMEOUT 90
     UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests1.m
     ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
     )

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

Summary of changes:
 Tests/FindMatlab/basic_checks/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake