diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeTests.cmake | 7 | ||||
| -rw-r--r-- | test/cache_common.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index b093064..98d488f 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -20,6 +20,7 @@ if (HDF5_TEST_VFD) sec2 stdio core + core_paged split multi family @@ -1158,10 +1159,16 @@ if (HDF5_TEST_VFD) set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES DEPENDS VFD-${vfdname}-flush1) set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10) + if (NOT CYGWIN) + set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800) + endif (NOT CYGWIN) if (BUILD_SHARED_LIBS) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES DEPENDS VFD-${vfdname}-flush1-shared) set_tests_properties (VFD-${vfdname}-flush1-shared PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10) + if (NOT CYGWIN) + set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800) + endif (NOT CYGWIN) endif (BUILD_SHARED_LIBS) if (HDF5_TEST_FHEAP_VFD) add_test ( diff --git a/test/cache_common.h b/test/cache_common.h index 9e8c5ba..c07ab25 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -360,7 +360,6 @@ typedef struct test_entry_t */ #define H5C__HASH_MASK ((size_t)(H5C__HASH_TABLE_LEN - 1) << 3) -#define H5C__HASH_FCN(x) (int)(((x) & H5C__HASH_MASK) >> 3) #define H5C_TEST__PRE_HT_SEARCH_SC(cache_ptr, Addr) \ if ( ( (cache_ptr) == NULL ) || \ |