summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-06-25 14:15:13 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-06-25 14:15:13 (GMT)
commit28ec2d26937a64584bb24ce75155e3923dadd49b (patch)
tree0c7a8f195f1532d338b03dc87bea819a9c7775fc
parentd9c1c23c3886b076dae569151bef6e8a23d7327e (diff)
downloadhdf5-28ec2d26937a64584bb24ce75155e3923dadd49b.zip
hdf5-28ec2d26937a64584bb24ce75155e3923dadd49b.tar.gz
hdf5-28ec2d26937a64584bb24ce75155e3923dadd49b.tar.bz2
[svn-r25357] Change default timeout to 1200 seconds or 20 mins
adjust up for certain tests.
-rw-r--r--CTestConfig.cmake4
-rw-r--r--perform/CMakeTests.cmake1
-rw-r--r--test/CMakeTests.cmake8
3 files changed, 7 insertions, 6 deletions
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 0e00427..7bbce4f 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -23,9 +23,9 @@ set (VALGRIND_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=
set (CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind")
set (CTEST_MEMORYCHECK_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")
-set (CTEST_TEST_TIMEOUT 3600 CACHE STRING
+set (CTEST_TEST_TIMEOUT 1200 CACHE STRING
"Maximum time allowed before CTest will kill the test.")
-set (DART_TESTING_TIMEOUT 3600 CACHE STRING
+set (DART_TESTING_TIMEOUT 1200 CACHE STRING
"Maximum time allowed before CTest will kill the test." FORCE)
SET(CTEST_SUBMIT_RETRY_DELAY 20 CACHE STRING
diff --git a/perform/CMakeTests.cmake b/perform/CMakeTests.cmake
index f8a5846..74055d5 100644
--- a/perform/CMakeTests.cmake
+++ b/perform/CMakeTests.cmake
@@ -32,6 +32,7 @@ add_test (
)
add_test (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
+set_tests_properties (PERFORM_h5perf_serial PROPERTIES TIMEOUT 1800)
if (HDF5_BUILD_PERFORM_STANDALONE)
add_test (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 57c139d..4198a4f 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -254,6 +254,9 @@ foreach (test ${H5_TESTS})
endforeach (test ${H5_TESTS})
set_tests_properties (H5TEST-flush2 PROPERTIES DEPENDS H5TEST-flush1)
+set_tests_properties (H5TEST-fheap PROPERTIES TIMEOUT 1800)
+set_tests_properties (H5TEST-testmeta PROPERTIES TIMEOUT 1800)
+set_tests_properties (H5TEST-big PROPERTIES TIMEOUT 1800)
##############################################################################
##############################################################################
@@ -491,10 +494,6 @@ if (HDF5_TEST_VFD)
)
endforeach (test ${H5_VFD_TESTS})
set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10)
- set_tests_properties (VFD-${vfdname}-objcopy PROPERTIES TIMEOUT 1000)
- set_tests_properties (VFD-${vfdname}-testhdf5 PROPERTIES TIMEOUT 1200)
- set_tests_properties (VFD-${vfdname}-gheap PROPERTIES TIMEOUT 1200)
- set_tests_properties (VFD-${vfdname}-istore PROPERTIES TIMEOUT 1200)
if (HDF5_TEST_FHEAP_VFD)
add_test (
NAME VFD-${vfdname}-fheap
@@ -507,6 +506,7 @@ if (HDF5_TEST_VFD)
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
+ set_tests_properties (VFD-${vfdname}-fheap PROPERTIES TIMEOUT 1800)
endif (HDF5_TEST_FHEAP_VFD)
ENDMACRO (ADD_VFD_TEST)