summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-11-22 21:04:26 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-11-22 21:04:34 (GMT)
commitc2e60909e35d988e86d78b7c8bfc0d2d51c4e75f (patch)
treece00f161d41dba5eee67eaadd7814d5f3f906b92
parentfff898558e3c828070abe81b4147bd959ed37ccb (diff)
downloadhdf5-c2e60909e35d988e86d78b7c8bfc0d2d51c4e75f.zip
hdf5-c2e60909e35d988e86d78b7c8bfc0d2d51c4e75f.tar.gz
hdf5-c2e60909e35d988e86d78b7c8bfc0d2d51c4e75f.tar.bz2
Add test to memcheck ignore and increase cache test timeout
-rw-r--r--config/cmake/CTestCustom.cmake1
-rw-r--r--test/CMakeTests.cmake12
2 files changed, 7 insertions, 6 deletions
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 481873e..f9431e7 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -211,6 +211,7 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5REPACK_VERIFY_LAYOUT_ALL-layout_long_switches #uses grepTest.cmake
H5REPACK_VERIFY_LAYOUT_ALL-layout_short_switches #uses grepTest.cmake
H5REPACK-plugin
+ H5REPACK_CMP-plugin_zero
######### tools/h5stat #########
H5STAT-clearall-objects
######### tools/misc #########
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index f4b37f3..5cca2d2 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -581,7 +581,7 @@ endforeach (test ${H5TEST_TESTS})
set_tests_properties (H5TEST-flush2 PROPERTIES DEPENDS H5TEST-flush1)
set_tests_properties (H5TEST-fheap PROPERTIES TIMEOUT 1800)
-set_tests_properties (H5TEST-big PROPERTIES TIMEOUT 1800)
+set_tests_properties (H5TEST-big PROPERTIES TIMEOUT 3600)
set_tests_properties (H5TEST-btree2 PROPERTIES TIMEOUT 1800)
set_tests_properties (H5TEST-objcopy PROPERTIES TIMEOUT 2400)
@@ -612,7 +612,7 @@ if (BUILD_SHARED_LIBS)
set_tests_properties (H5TEST-shared-flush2 PROPERTIES DEPENDS H5TEST-shared-flush1)
set_tests_properties (H5TEST-shared-fheap PROPERTIES TIMEOUT 1800)
- set_tests_properties (H5TEST-shared-big PROPERTIES TIMEOUT 1800)
+ set_tests_properties (H5TEST-shared-big PROPERTIES TIMEOUT 3600)
set_tests_properties (H5TEST-shared-btree2 PROPERTIES TIMEOUT 1800)
set_tests_properties (H5TEST-shared-objcopy PROPERTIES TIMEOUT 2400)
endif (BUILD_SHARED_LIBS)
@@ -638,7 +638,7 @@ if (NOT CYGWIN)
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
- set_tests_properties (H5TEST-cache PROPERTIES TIMEOUT 2400)
+ set_tests_properties (H5TEST-cache PROPERTIES TIMEOUT 3600)
endif (NOT CYGWIN)
#-- Adding test for err_compat
@@ -745,7 +745,7 @@ if (BUILD_SHARED_LIBS)
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST-shared;HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST-shared
)
- set_tests_properties (H5TEST-shared-cache PROPERTIES TIMEOUT 2400)
+ set_tests_properties (H5TEST-shared-cache PROPERTIES TIMEOUT 3600)
endif (NOT CYGWIN)
#-- Adding test for err_compat
@@ -1072,7 +1072,7 @@ if (HDF5_TEST_VFD)
set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10)
set_tests_properties (VFD-${vfdname}-istore PROPERTIES TIMEOUT 1800)
if (NOT CYGWIN)
- set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800)
+ set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 3600)
endif (NOT CYGWIN)
if (BUILD_SHARED_LIBS)
set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES DEPENDS VFD-${vfdname}-flush1-shared)
@@ -1080,7 +1080,7 @@ if (HDF5_TEST_VFD)
set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10)
set_tests_properties (VFD-${vfdname}-istore-shared PROPERTIES TIMEOUT 1800)
if (NOT CYGWIN)
- set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800)
+ set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 3600)
endif (NOT CYGWIN)
endif (BUILD_SHARED_LIBS)
if (HDF5_TEST_FHEAP_VFD)