diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2019-01-25 06:20:28 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2019-01-25 06:20:28 (GMT) |
| commit | 0247f7b78d056b04fa08f74a2d4c4eea37f48d22 (patch) | |
| tree | 00b89cfd88016cd1d93ae75060dfc3299cbd7967 /test | |
| parent | 51e0107d18c4ccdc61689c2dc6cc8bbf35edeaab (diff) | |
| parent | 2fe69e7639198b174da393e47a029d0ac35b31c8 (diff) | |
| download | hdf5-0247f7b78d056b04fa08f74a2d4c4eea37f48d22.zip hdf5-0247f7b78d056b04fa08f74a2d4c4eea37f48d22.tar.gz hdf5-0247f7b78d056b04fa08f74a2d4c4eea37f48d22.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_fixbug into develop
Diffstat (limited to 'test')
| -rw-r--r-- | test/cache_image.c | 11 | ||||
| -rw-r--r-- | test/direct_chunk.c | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/cache_image.c b/test/cache_image.c index 10c37f0..ee49502 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -713,6 +713,9 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, file_id = H5Fopen(hdf_file_name, H5F_ACC_RDWR, fapl_id); } + /* tidy up */ + H5Pclose(fapl_id); + if ( file_id < 0 ) { pass = FALSE; @@ -4720,7 +4723,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) *------------------------------------------------------------------------- */ -#define MAX_NUM_GROUPS 128 +#define MAX_NUM_GROUPS 64 static unsigned cache_image_smoke_check_5(hbool_t single_file_vfd) @@ -4756,12 +4759,16 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) /* setup the file name */ if ( pass ) { - if ( h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) + hid_t fapl_id = h5_fileaccess(); + + if ( h5_fixname(FILENAMES[0], fapl_id, filename, sizeof(filename)) == NULL ) { pass = FALSE; failure_mssg = "h5_fixname() failed.\n"; } + + H5Pclose(fapl_id); } if ( show_progress ) diff --git a/test/direct_chunk.c b/test/direct_chunk.c index 2ef38ea..2edfe64 100644 --- a/test/direct_chunk.c +++ b/test/direct_chunk.c @@ -1910,10 +1910,10 @@ test_read_unallocated_chunk (hid_t file) goto error; /* Write a single chunk to intialize the chunk storage */ - HDmemset(&chunk_dims, 0, sizeof(chunk_dims)); + HDmemset(direct_buf, 0, CHUNK_NX * CHUNK_NY * sizeof(int)); offset[0] = 0; offset[1] = 0; - if(H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, chunk_nbytes, &chunk_dims) < 0) + if(H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, chunk_nbytes, direct_buf) < 0) goto error; /* Attempt to read each chunk in the dataset. Chunks are not allocated, |