diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2016-11-12 19:01:32 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2016-11-12 19:01:32 (GMT) |
| commit | 99f123098e8cc646961b6ab2f2ad205a366b7879 (patch) | |
| tree | 1ec049d16537d15f2f7afa3eb2f6608673eb3083 /test | |
| parent | 70938cbf28ca91a17d8d975d5b5ebcd44648e1c9 (diff) | |
| parent | 80ac4343cdf0640b114b846db87c091c6e7c66a6 (diff) | |
| download | hdf5-99f123098e8cc646961b6ab2f2ad205a366b7879.zip hdf5-99f123098e8cc646961b6ab2f2ad205a366b7879.tar.gz hdf5-99f123098e8cc646961b6ab2f2ad205a366b7879.tar.bz2 | |
Merge pull request #154 in HDFFV/hdf5 from ~KOZIOL/hdf5:develop_merge_revise_chunks_04 to develop
* commit '80ac4343cdf0640b114b846db87c091c6e7c66a6':
Align w/minor cleanups in revise_chunks branch.
Diffstat (limited to 'test')
| -rw-r--r-- | test/cache_common.c | 32 | ||||
| -rw-r--r-- | test/earray.c | 2 |
2 files changed, 13 insertions, 21 deletions
diff --git a/test/cache_common.c b/test/cache_common.c index 4436d7f..945442a 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -3535,21 +3535,17 @@ flush_cache(H5F_t * file_ptr, void cork_entry_type(H5F_t *file_ptr, int32_t type) { - H5C_t *cache_ptr; - haddr_t baddrs; - herr_t result; - if(pass) { + H5C_t *cache_ptr; + haddr_t baddrs; + cache_ptr = file_ptr->shared->cache; - HDassert( cache_ptr ); - HDassert( ( 0 <= type ) && ( type < NUMBER_OF_ENTRY_TYPES ) ); + HDassert(cache_ptr); + HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); baddrs = base_addrs[type]; - - result = H5C_cork(cache_ptr, baddrs, H5C__SET_CORK, NULL); - if(result < 0) { - + if(H5C_cork(cache_ptr, baddrs, H5C__SET_CORK, NULL) < 0) { pass = FALSE; failure_mssg = "error in H5C_cork()."; } /* end if */ @@ -3575,21 +3571,17 @@ cork_entry_type(H5F_t *file_ptr, int32_t type) void uncork_entry_type(H5F_t *file_ptr, int32_t type) { - H5C_t *cache_ptr; - haddr_t baddrs; - herr_t result; - if(pass) { + H5C_t *cache_ptr; + haddr_t baddrs; + cache_ptr = file_ptr->shared->cache; - HDassert( cache_ptr ); - HDassert( ( 0 <= type ) && ( type < NUMBER_OF_ENTRY_TYPES ) ); + HDassert(cache_ptr); + HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); baddrs = base_addrs[type]; - - result = H5C_cork(cache_ptr, baddrs, H5C__UNCORK, NULL); - if(result < 0) { - + if(H5C_cork(cache_ptr, baddrs, H5C__UNCORK, NULL) < 0) { pass = FALSE; failure_mssg = "error in H5C_cork()."; } /* end if */ diff --git a/test/earray.c b/test/earray.c index c3c7d3d..44d16c5 100644 --- a/test/earray.c +++ b/test/earray.c @@ -200,7 +200,7 @@ const H5AC_class_t H5AC_EARRAY_TEST[1] = {{ /* id */ H5AC_TEST_ID, /* name */ "earray test", /* mem_type */ H5FD_MEM_DEFAULT, - /* flags */ H5AC__CLASS_NO_IO_FLAG, + /* flags */ H5AC__CLASS_SKIP_READS | H5AC__CLASS_SKIP_WRITES, /* get_load_size */ (H5AC_get_load_size_func_t)earray_cache_test_get_load_size, /* deserialize */ (H5AC_deserialize_func_t)earray_cache_test_deserialize, /* image_len */ (H5AC_image_len_func_t)earray_cache_test_image_len, |