diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-12 04:39:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-12 04:39:55 (GMT) |
| commit | 040d7358870e72d18f6083053f200c211d6b6e34 (patch) | |
| tree | 2a7e1e68f51f32b00a88da33869eb56733f72698 /test | |
| parent | 4b3730011f553513fa93c3269171863cf825fd8c (diff) | |
| download | hdf5-040d7358870e72d18f6083053f200c211d6b6e34.zip hdf5-040d7358870e72d18f6083053f200c211d6b6e34.tar.gz hdf5-040d7358870e72d18f6083053f200c211d6b6e34.tar.bz2 | |
[svn-r28034] Description:
Merge r27710 from trunk to branch. (And some other minor cleanups)
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial
(h5committest not required on this branch)
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/cache_common.c | 4 | ||||
| -rw-r--r-- | test/cache_logging.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index d07837d..dedb4a1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -151,7 +151,7 @@ flush2.chkexe_: flush1.chkexe_ # prefix or low-level driver with environment variables will influence # the temporary file name in ways that the makefile is not aware of. CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 \ - dset_offset.h5 chunk_fixed.h5 cache_logging.log \ + dset_offset.h5 chunk_fixed.h5 cache_logging.out \ max_compact_dataset.h5 simple.h5 set_local.h5 random_chunks.h5 \ huge_chunks.h5 chunk_cache.h5 big_chunk.h5 chunk_fast.h5 \ chunk_expand.h5 layout_extend.h5 swmr_fail.h5 partial_chunks.h5 \ diff --git a/test/cache_common.c b/test/cache_common.c index 9936e47..c8444b0 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -3209,7 +3209,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 ) { @@ -3319,7 +3319,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; } diff --git a/test/cache_logging.c b/test/cache_logging.c index fa2a752..682ff6d 100644 --- a/test/cache_logging.c +++ b/test/cache_logging.c @@ -17,7 +17,7 @@ #include "h5test.h" -#define LOG_LOCATION "cache_logging.log" +#define LOG_LOCATION "cache_logging.out" #define FILE_NAME "cache_logging" #define N_GROUPS 100 |