diff options
Diffstat (limited to 'test/tsohm.c')
-rw-r--r-- | test/tsohm.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/test/tsohm.c b/test/tsohm.c index 5c3707f..8cf4d2f 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -595,7 +595,7 @@ error: *------------------------------------------------------------------------- */ static hid_t -size1_helper(hid_t file, const char *filename, hid_t fapl_id, int test_file_closing) +size1_helper(hid_t file, const char *filename, hid_t fapl_id, unsigned test_file_closing) { dtype1_struct wdata; dtype1_struct rdata; @@ -749,10 +749,10 @@ getsize_testsize1(const char *filename, hid_t fcpl_id, hid_t fapl_id, unsigned o hid_t file = -1; herr_t ret; - file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, fapl_id); + file = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, fapl_id); CHECK_I(file, "H5Fcreate"); - file = size1_helper(file, FILENAME, fapl_id, open_close); + file = size1_helper(file, filename, fapl_id, open_close); CHECK_I(file, "size1_helper"); ret = H5Oget_info_by_name2(file, DSETNAME[0], oinfo, H5O_INFO_HDR, H5P_DEFAULT); @@ -761,7 +761,7 @@ getsize_testsize1(const char *filename, hid_t fcpl_id, hid_t fapl_id, unsigned o ret = H5Fclose(file); CHECK_I(ret, "H5Fclose"); - return h5_get_file_size(FILENAME, fapl_id); + return h5_get_file_size(filename, fapl_id); } /* getsize_testsize1 */ @@ -790,7 +790,9 @@ test_sohm_size1(void) hsize_t oh_sizes[3]; unsigned oh_size_index = 0; +#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */ hsize_t norm_oh_size; +#endif /* Jira HDFFV-10646 */ hsize_t sohm_oh_size; hsize_t sohm_btree_oh_size; h5_stat_size_t norm_empty_filesize; @@ -886,7 +888,9 @@ test_sohm_size1(void) norm_empty_filesize = file_sizes[0]; norm_final_filesize = file_sizes[1]; norm_final_filesize2 = file_sizes[2]; +#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */ norm_oh_size = oh_sizes[0]; +#endif /* Jira HDFFV-10646 */ sohm_empty_filesize = file_sizes[3]; sohm_final_filesize = file_sizes[4]; @@ -941,6 +945,7 @@ test_sohm_size1(void) } /* test_sohm_size1 */ +#if 0 /* TODO: REVEALS BUG TO BE FIXED - SEE JIRA HDFFV-10645 */ /*--------------------------------------------------------------------------- * Function: test_sohm_size_consistency_open_create @@ -1045,6 +1050,7 @@ test_sohm_size_consistency_open_create(void) ret = H5Pclose(fapl_id); CHECK_I(ret, "H5Pclose"); } /* test_sohm_size_consistency_open_create */ +#endif /* Jira HDFFV-10645 */ /*------------------------------------------------------------------------- @@ -1176,6 +1182,7 @@ static void test_sohm_attrs(void) { hid_t fcpl_id; + hid_t file_id; unsigned i = 0; #define TSOHM_TSA_NFLAGS_1 7 unsigned flags1[TSOHM_TSA_NFLAGS_1] = { @@ -1293,8 +1300,8 @@ test_sohm_attrs(void) ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ATTR_FLAG, 2); CHECK_I(ret, "H5Pset_shared_mesg_nindexes"); - ret = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); - VERIFY(ret, -1, "H5Fcreate"); + file_id = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); + VERIFY(file_id, -1, "H5Fcreate"); ret = H5Pclose(fcpl_id); CHECK_I(ret, "H5Pclose"); |