[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
Tue Feb 7 14:20:34 CST 2012


branch "master" has been updated
       via  ce28292c0dbb4edcb8a44a9979ac547a0db6a817 (commit)
      from  77e05f51eb35f8e0a8c567b950ba3f87966a9b14 (commit)

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


- Log -----------------------------------------------------------------
commit ce28292c0dbb4edcb8a44a9979ac547a0db6a817
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Feb 7 16:49:56 2012 -0330

    Allowing test timeouts to be overridden in the target's CMakeLists.txt file.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index d699e31..2d046ba 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -1117,6 +1117,9 @@ function(astscf_test_boost NAME)
   set(project_test_results "${CMAKE_BINARY_DIR}/test_results/${ASTSCF_PROJECT}")
   file(MAKE_DIRECTORY "${project_test_results}")
   file(TO_NATIVE_PATH "${project_test_results}-${NAME}.xml" project_test_results)
+  if(LOCAL_TIMEOUT_OVERRIDE)
+    set(TEST_TIMEOUT_SEC "${LOCAL_TIMEOUT_OVERRIDE}")
+  endif()
   __astscf_set_test_props("${NAME}" "${project_test_results}")
 endfunction()
 
@@ -1126,5 +1129,8 @@ function(astscf_test_icebox NAME CONFIG)
   set(project_test_results "${CMAKE_BINARY_DIR}/test_results/${ASTSCF_PROJECT}")
   file(MAKE_DIRECTORY "${project_test_results}")
   file(TO_NATIVE_PATH "${project_test_results}-${NAME}.xml" project_test_results)
+  if(LOCAL_TIMEOUT_OVERRIDE)
+    set(TEST_TIMEOUT_SEC "${LOCAL_TIMEOUT_OVERRIDE}")
+  endif()
   __astscf_set_test_props("${NAME}" "${project_test_results}")
 endfunction()

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


-- 
asterisk-scf/release/cmake.git



More information about the asterisk-scf-commits mailing list