diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-05-19 19:56:15 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:37:22 (GMT) |
| commit | b4492dba5070d73bac83ec27c644e4e8d4e3871f (patch) | |
| tree | 191fd3b82d95c35729548eca5c7594f8b1b819f9 /test | |
| parent | 7f0d3f431e14703eff629cf95e4a1b64792a1b0b (diff) | |
| download | hdf5-b4492dba5070d73bac83ec27c644e4e8d4e3871f.zip hdf5-b4492dba5070d73bac83ec27c644e4e8d4e3871f.tar.gz hdf5-b4492dba5070d73bac83ec27c644e4e8d4e3871f.tar.bz2 | |
Reduce diffs with `develop`.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dtypes.c | 2 | ||||
| -rw-r--r-- | test/tfile.c | 9 | ||||
| -rw-r--r-- | test/tselect.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/test/dtypes.c b/test/dtypes.c index 98abe5c..0f95830 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -6732,7 +6732,7 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl, hid_t my_fapl; /* Copy of file access property list ID */ hid_t dcpl; /* Dataset creation property list ID */ unsigned use_at_least_v18;/* Whether to use old or new format */ - herr_t H5_ATTR_SANITY_CHECK status; /* Generic return value */ + herr_t H5_ATTR_NDEBUG_UNUSED status; /* Generic return value */ /* Make copy of FAPL */ my_fapl = H5Pcopy(fapl); diff --git a/test/tfile.c b/test/tfile.c index bce7ce9..d6047dc 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -4209,8 +4209,7 @@ test_filespace_info(const char *env_h5_drvr) ** *****************************************************************/ static int -set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t H5_ATTR_SANITY_CHECK multi, - hbool_t split) +set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) { H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; @@ -4219,7 +4218,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t H5_ATTR_SANITY_CHECK multi hbool_t relax; H5FD_mem_t mt; - HDassert(split || multi); + HDassert(split); HDmemset(memb_name, 0, sizeof memb_name); @@ -4310,7 +4309,7 @@ test_file_freespace(const char *env_h5_drvr) my_fapl = new_fapl; if(multi_vfd || split_vfd) { - ret = set_multi_split(new_fapl, FSP_SIZE_DEF, multi_vfd, split_vfd); + ret = set_multi_split(new_fapl, FSP_SIZE_DEF, split_vfd); CHECK(ret, FAIL, "set_multi_split"); } @@ -4476,7 +4475,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) /* Set up paged aligned address space for multi/split driver */ if(multi_vfd || split_vfd) { - ret = set_multi_split(fapl, FSP_SIZE_DEF, multi_vfd, split_vfd); + ret = set_multi_split(fapl, FSP_SIZE_DEF, split_vfd); CHECK(ret, FAIL, "set_multi_split"); } diff --git a/test/tselect.c b/test/tselect.c index 9c1cbae..492a917 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -1612,7 +1612,7 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist) ****************************************************************/ static void verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, - size_t H5_ATTR_SANITY_CHECK cube_size, unsigned edge_size, unsigned cube_rank) + size_t H5_ATTR_NDEBUG_UNUSED cube_size, unsigned edge_size, unsigned cube_rank) { const uint16_t *cube_ptr; /* Pointer into the cube buffer */ uint16_t expected_value; /* Expected value in dataset */ |