[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Wed Apr 13 08:51:34 CDT 2011


branch "master" has been updated
       via  df39a18da3e617f8ee16a559143d6ac72f312063 (commit)
      from  7a90d1536f85845e1a0005b29b72a51e12def2f5 (commit)

Summary of changes:
 AsteriskSCF.cmake |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit df39a18da3e617f8ee16a559143d6ac72f312063
Author: David M. Lee <dlee at digium.com>
Date:   Wed Apr 13 08:48:21 2011 -0500

    Added default test timeout of 60 seconds.
    
    This change prevents a hanging test from hanging the build.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 990b117..48aaa53 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -47,6 +47,7 @@
 #
 
 set(MIN_BOOST_VERSION 1.40)
+set(TEST_TIMEOUT_SEC 60)
 
 if(CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
     message(FATAL_ERROR "This project must not be built in the source directory")
@@ -725,9 +726,11 @@ function(boost_add_test EXE)
         "--report_sink=${CMAKE_BINARY_DIR}/${EXE}-result.xml"
         "--report_format=XML"
 	"--report_level=detailed")
+    set_tests_properties("${EXE}" PROPERTIES TIMEOUT ${TEST_TIMEOUT_SEC})
 endfunction()
 
 function(icebox_add_test NAME CONFIG)
     find_package(IceBox REQUIRED)
     add_test(NAME "${NAME}" COMMAND "${ICEBOX_EXECUTABLE}" "--Ice.Config=${CONFIG}")
+    set_tests_properties("${NAME}" PROPERTIES TIMEOUT ${TEST_TIMEOUT_SEC})
 endfunction()

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


-- 
asterisk-scf/release/cmake.git



More information about the asterisk-scf-commits mailing list