diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-11 14:08:04 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-11 14:08:04 (GMT) |
| commit | 122bf84bb3623df66306da08275c4cb65e15475e (patch) | |
| tree | 5436fac979c46632f66509ab876d9401c40a231d /test | |
| parent | f3da95644105e1a70f7b5246128ff542585695e5 (diff) | |
| parent | 1ac1dfb40fc603fdb5448a64eb46786f7c621185 (diff) | |
| download | hdf5-122bf84bb3623df66306da08275c4cb65e15475e.zip hdf5-122bf84bb3623df66306da08275c4cb65e15475e.tar.gz hdf5-122bf84bb3623df66306da08275c4cb65e15475e.tar.bz2 | |
[svn-r27760] Brought r27631-27755 over from the trunk.
tested on: jam
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeTests.cmake | 4 | ||||
| -rw-r--r-- | test/cache_common.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 522e968..662b8c9 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -452,6 +452,7 @@ 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) +set_tests_properties (H5TEST-objcopy PROPERTIES TIMEOUT 2400) if (BUILD_SHARED_LIBS) # Remove any output file left over from previous test run @@ -542,6 +543,7 @@ if (BUILD_SHARED_LIBS) set_tests_properties (H5TEST-shared-fheap PROPERTIES TIMEOUT 1800) set_tests_properties (H5TEST-shared-testmeta PROPERTIES TIMEOUT 1800) set_tests_properties (H5TEST-shared-big PROPERTIES TIMEOUT 1800) + set_tests_properties (H5TEST-shared-objcopy PROPERTIES TIMEOUT 2400) endif (BUILD_SHARED_LIBS) ############################################################################## @@ -730,7 +732,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-cache PROPERTIES TIMEOUT 2400) + set_tests_properties (H5TEST-shared-cache PROPERTIES TIMEOUT 2400) endif (NOT CYGWIN) #-- Adding test for cache_api diff --git a/test/cache_common.c b/test/cache_common.c index f3da908..a3287cf 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -3061,7 +3061,7 @@ setup_cache(size_t max_cache_size, if ( pass ) { /* allocate space for test entries */ - actual_base_addr = H5MF_alloc(file_ptr, H5FD_MEM_DEFAULT, H5P_DEFAULT, + actual_base_addr = H5MF_alloc(file_ptr, H5FD_MEM_DEFAULT, H5P_DATASET_XFER_DEFAULT, (hsize_t)(ADDR_SPACE_SIZE + BASE_ADDR)); if ( actual_base_addr == HADDR_UNDEF ) { @@ -3171,7 +3171,7 @@ takedown_cache(H5F_t * file_ptr, HDassert ( file_ptr ); } - H5MF_xfree(file_ptr, H5FD_MEM_DEFAULT, H5P_DEFAULT, saved_actual_base_addr, + H5MF_xfree(file_ptr, H5FD_MEM_DEFAULT, H5P_DATASET_XFER_DEFAULT, saved_actual_base_addr, (hsize_t)(ADDR_SPACE_SIZE + BASE_ADDR)); saved_actual_base_addr = HADDR_UNDEF; } |