diff options
Diffstat (limited to 'test')
69 files changed, 1166 insertions, 1498 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 73cb96e..bad52c8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -35,9 +35,9 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src # test_vds_swmr.sh: vds_swmr* # test_use_cases.sh: use_append_chunk, use_append_mchunks, use_disable_mdc_flushes TEST_SCRIPT = test_abort_fail.sh test_check_version.sh test_error.sh \ - test_flush_refresh.sh test_external_env.sh test_libinfo.sh \ - test_links_env.sh test_swmr.sh test_vds_env.sh test_vds_swmr.sh \ - test_use_cases.sh + test_flush_refresh.sh test_external_env.sh test_libinfo.sh \ + test_links_env.sh test_swmr.sh test_vds_env.sh test_vds_swmr.sh \ + test_use_cases.sh SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) links_env$(EXEEXT) \ external_env$(EXEEXT) filenotclosed$(EXEEXT) del_many_dense_attrs$(EXEEXT) \ flushrefresh$(EXEEXT) use_append_chunk$(EXEEXT) use_append_mchunks$(EXEEXT) use_disable_mdc_flushes$(EXEEXT) \ @@ -241,8 +241,11 @@ use_append_mchunks_SOURCES=use_append_mchunks.c use_common.c use_disable_mdc_flushes_SOURCES=use_disable_mdc_flushes.c # Temporary files. -DISTCLEANFILES=testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh test_filter_plugin.sh \ - testexternal_env.sh testswmr.sh testvds_env.sh testvdsswmr.sh test_usecases.sh testflushrefresh.sh \ - testabort_fail.sh test_vol_plugin.sh test_mirror.sh +DISTCLEANFILES=test_abort_fail.sh test_check_version.sh test_error.sh test_external_env.sh \ + test_flush_refresh.sh test_libinfo.sh test_links_env.sh test_plugin.sh \ + test_swmr.sh test_use_cases.sh test_vds_env.sh test_vds_swmr.sh +if MIRROR_VFD_CONDITIONAL + DISTCLEANFILES+= test_mirror.sh +endif include $(top_srcdir)/config/conclude.am diff --git a/test/accum.c b/test/accum.c index 16f3511..816d9c0 100644 --- a/test/accum.c +++ b/test/accum.c @@ -8,7 +8,6 @@ * distribution tree, or in https://www.hdfgroup.org/licenses. * * If you do not have access to either file, you may request a copy from * * help@hdfgroup.org. * - * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* Programmer: Mike McGreevy diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c index 957ab14..1269c5a 100644 --- a/test/accum_swmr_reader.c +++ b/test/accum_swmr_reader.c @@ -8,7 +8,6 @@ * distribution tree, or in https://www.hdfgroup.org/licenses. * * If you do not have access to either file, you may request a copy from * * help@hdfgroup.org. * - * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "h5test.h" @@ -105,8 +105,6 @@ static hsize_t values_used[WRT_N]; * Programmer: Robb Matzke * Tuesday, November 24, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static hsize_t @@ -153,8 +151,6 @@ randll(hsize_t limit, int current_index) * Programmer: Robb Matzke * Wednesday, July 15, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -196,8 +192,6 @@ is_sparse(void) * Programmer: Raymond Lu * Wednesday, April 18, 2007 * - * Modifications: - * *------------------------------------------------------------------------- */ static fsizes_t @@ -266,8 +260,6 @@ error: * Programmer: Robb Matzke * Thursday, August 6, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ /* Disable warning for "format not a string literal" here -QAK */ @@ -332,10 +324,6 @@ H5_GCC_CLANG_DIAG_ON("format-nonliteral") * Programmer: Robb Matzke * Wednesday, April 8, 1998 * - * Modifications: - * Robb Matzke, 15 Jul 1998 - * Addresses are written to the file DNAME instead of stdout. - * *------------------------------------------------------------------------- */ static int @@ -485,8 +473,6 @@ error: * Programmer: Robb Matzke * Friday, April 10, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -591,8 +577,6 @@ error: * Programmer: Albert Chent * Mar 28, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -757,15 +741,6 @@ error: * Programmer: Robb Matzke * Friday, April 10, 1998 * - * Modifications: - * Albert Cheng, 2002/03/28 - * Added command option -fsize. - * Albert Cheng, 2002/04/19 - * Added command option -c. - * - * Raymond Lu, 2007/05/25 - * Added similar tests for SEC2 and STDIO drivers. - * *------------------------------------------------------------------------- */ int diff --git a/test/bittests.c b/test/bittests.c index 3fbd096..285f404 100644 --- a/test/bittests.c +++ b/test/bittests.c @@ -37,8 +37,6 @@ * Programmer: Robb Matzke * Tuesday, June 16, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -154,8 +152,6 @@ failed: * Programmer: Robb Matzke * Tuesday, June 16, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -280,8 +276,6 @@ failed: * Programmer: Raymond Lu * Monday, April 12, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -419,8 +413,6 @@ failed: * Programmer: Raymond Lu * Monday, April 12, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -510,8 +502,6 @@ failed: * Programmer: Raymond Lu * Monday, April 12, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -584,8 +574,6 @@ failed: * Programmer: Raymond Lu * Monday, April 12, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -688,8 +676,6 @@ failed: * Programmer: Robb Matzke * Tuesday, June 16, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -808,8 +794,6 @@ failed: * Programmer: Robb Matzke * Tuesday, June 16, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t diff --git a/test/cache.c b/test/cache.c index 666615b..517c0b5 100644 --- a/test/cache.c +++ b/test/cache.c @@ -1052,11 +1052,7 @@ smoke_check_5(int express_test, unsigned paged) H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, -#if 1 /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, -#else - /* H5C_auto_resize_report_fcn rpt_fcn = */ H5C_def_auto_resize_rpt_fcn, -#endif /* hbool_t set_initial_size = */ TRUE, /* size_t initial_size = */ (2 * 1024 * 1024), @@ -1093,8 +1089,7 @@ smoke_check_5(int express_test, unsigned paged) /* int32_t epochs_before_eviction = */ 3, /* hbool_t apply_empty_reserve = */ TRUE, - /* double empty_reserve = */ 0.5 - }; + /* double empty_reserve = */ 0.5}; if (paged) TESTING("smoke check #5P -- all clean, ins, prot, unprot, AR cache 1"); @@ -1284,11 +1279,7 @@ smoke_check_6(int express_test, unsigned paged) H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, -#if 1 /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, -#else - /* H5C_auto_resize_report_fcn rpt_fcn = */ H5C_def_auto_resize_rpt_fcn, -#endif /* hbool_t set_initial_size = */ TRUE, /* size_t initial_size = */ (2 * 1024 * 1024), @@ -1325,8 +1316,7 @@ smoke_check_6(int express_test, unsigned paged) /* int32_t epochs_before_eviction = */ 3, /* hbool_t apply_empty_reserve = */ TRUE, - /* double empty_reserve = */ 0.05 - }; + /* double empty_reserve = */ 0.05}; if (paged) TESTING("smoke check #6P -- ~1/2 dirty, ins, prot, unprot, AR cache 1"); @@ -1516,11 +1506,7 @@ smoke_check_7(int express_test, unsigned paged) H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, -#if 1 /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, -#else - /* H5C_auto_resize_report_fcn rpt_fcn = */ H5C_def_auto_resize_rpt_fcn, -#endif /* hbool_t set_initial_size = */ TRUE, /* size_t initial_size = */ (2 * 1024 * 1024), @@ -1558,8 +1544,7 @@ smoke_check_7(int express_test, unsigned paged) /* int32_t epochs_before_eviction = */ 3, /* hbool_t apply_empty_reserve = */ TRUE, - /* double empty_reserve = */ 0.1 - }; + /* double empty_reserve = */ 0.1}; if (paged) TESTING("smoke check #7P -- all clean, ins, prot, unprot, AR cache 2"); @@ -1749,11 +1734,7 @@ smoke_check_8(int express_test, unsigned paged) H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, -#if 1 /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, -#else - /* H5C_auto_resize_report_fcn rpt_fcn = */ H5C_def_auto_resize_rpt_fcn, -#endif /* hbool_t set_initial_size = */ TRUE, /* size_t initial_size = */ (2 * 1024 * 1024), @@ -1791,8 +1772,7 @@ smoke_check_8(int express_test, unsigned paged) /* int32_t epochs_before_eviction = */ 3, /* hbool_t apply_empty_reserve = */ TRUE, - /* double empty_reserve = */ 0.1 - }; + /* double empty_reserve = */ 0.1}; if (paged) TESTING("smoke check #8P -- ~1/2 dirty, ins, prot, unprot, AR cache 2"); @@ -1969,10 +1949,6 @@ smoke_check_8(int express_test, unsigned paged) * Programmer: John Mainzer * 8/1/07 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -2287,10 +2263,6 @@ smoke_check_9(int express_test, unsigned paged) * Programmer: John Mainzer * 8/1/07 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -2600,8 +2572,6 @@ smoke_check_10(int express_test, unsigned paged) * Programmer: John Mainzer * 6/24/04 * - * Modifications: - * *------------------------------------------------------------------------- */ static unsigned @@ -2812,12 +2782,6 @@ write_permitted_check(int * Programmer: John Mainzer * 8/10/06 * - * Modifications: - * - * Updated tests to accommodate the case in which the - * slist is disabled. - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -3093,8 +3057,6 @@ check_insert_entry(unsigned paged) * Programmer: John Mainzer * 1/10/05 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -3183,14 +3145,6 @@ check_flush_cache(unsigned paged) * Programmer: John Mainzer * 1/12/05 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -3252,11 +3206,6 @@ check_flush_cache__empty_cache(H5F_t *file_ptr) * Programmer: John Mainzer * 1/14/05 * - * Modifications: - * - * JRM -- 4/5/06 - * Added pinned entry tests. - * *------------------------------------------------------------------------- */ @@ -4452,14 +4401,6 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) * Programmer: John Mainzer * 1/13/05 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -4474,13 +4415,6 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int test_entry_t *base_addr; test_entry_t *entry_ptr; -#if 0 /* JRM */ - /* This gets used a lot, so lets leave it in. */ - - HDfprintf(stdout, "check_flush_cache__multi_entry_test: test %d\n", - test_num); -#endif /* JRM */ - if (cache_ptr == NULL) { pass = FALSE; @@ -4556,19 +4490,6 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int (entry_ptr->serialized != spec[u].expected_serialized) || (entry_ptr->destroyed != spec[u].expected_destroyed)) { -#if 0 /* This is useful debugging code. Lets keep it around. */ - - HDfprintf(stdout, - "deslzd = %d(%d), slzd = %d(%d), dest = %d(%d)\n", - (int)(entry_ptr->deserialized), - (int)(spec[u].expected_deserialized), - (int)(entry_ptr->serialized), - (int)(spec[u].expected_serialized), - (int)(entry_ptr->destroyed), - (int)(spec[u].expected_destroyed)); - -#endif - pass = FALSE; HDsnprintf(msg, (size_t)128, "Bad status on entry %u after flush in multi entry test #%d.", u, test_num); @@ -4637,14 +4558,6 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int * Programmer: John Mainzer * 4/5/06 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/16/20 - * *------------------------------------------------------------------------- */ @@ -4660,13 +4573,6 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i test_entry_t *base_addr; test_entry_t *entry_ptr; -#if 0 /* JRM */ - /* This is useful debugging code. Leave it in for now. */ - - HDfprintf(stdout, "check_flush_cache__pe_multi_entry_test: test %d\n", - test_num); -#endif /* JRM */ - if (cache_ptr == NULL) { pass = FALSE; @@ -4749,19 +4655,6 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i (entry_ptr->serialized != spec[u].expected_serialized) || (entry_ptr->destroyed != spec[u].expected_destroyed)) { -#if 0 /* This is useful debugging code. Lets keep it around. */ - - HDfprintf(stdout, - "desrlzd = %d(%d), srlzd = %d(%d), dest = %d(%d)\n", - (int)(entry_ptr->deserialized), - (int)(spec[u].expected_deserialized), - (int)(entry_ptr->serialized), - (int)(spec[u].expected_serialized), - (int)(entry_ptr->destroyed), - (int)(spec[u].expected_destroyed)); - -#endif - pass = FALSE; HDsnprintf(msg, (size_t)128, "Bad status on entry %u after flush in pe multi entry test #%d.", u, test_num); @@ -4835,8 +4728,6 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i * Programmer: John Mainzer * 9/3/06 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -8202,14 +8093,6 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) * Programmer: John Mainzer * 9/3/06 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/16/20 - * *------------------------------------------------------------------------- */ @@ -8227,11 +8110,6 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu test_entry_t *base_addr; test_entry_t *entry_ptr; -#if 0 /* This is useful debugging code -- lets keep it around. */ - HDfprintf(stdout, "check_flush_cache__flush_op_test: test %d\n", - test_num); -#endif - if (cache_ptr == NULL) { pass = FALSE; @@ -8350,21 +8228,6 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu (entry_ptr->serialized != spec[i].expected_serialized) || (entry_ptr->destroyed != spec[i].expected_destroyed)) { -#if 0 /* This is useful debugging code. Lets keep it around. */ - - HDfprintf(stdout, - "desrlzd = %d(%d), srlzd = %d(%d), dest = %d(%d)\n", - (int)(entry_ptr->deserialized), - (int)(spec[i].expected_deserialized), - (int)(entry_ptr->serialized), - (int)(spec[i].expected_serialized), - (int)(entry_ptr->destroyed), - (int)(spec[i].expected_destroyed)); - - HDfprintf(stdout, "entry_ptr->header.is_dirty = %d\n", - (int)(entry_ptr->header.is_dirty)); -#endif - pass = FALSE; HDsnprintf(msg, (size_t)128, "Bad status on entry %d after flush op test #%d.", i, test_num); failure_mssg = msg; @@ -8402,107 +8265,6 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu (entry_ptr->serialized != check[i].expected_serialized) || (entry_ptr->destroyed != check[i].expected_destroyed)) { -#if 0 /* This is useful debugging code. Lets keep it around for a while. */ - - if ( entry_ptr->size != check[i].expected_size ) { - - HDfprintf(stdout, "entry_ptr->size (expected) = %d (%d).\n", - (int)(entry_ptr->size), - (int)(check[i].expected_size)); - } - - if ( ( ! entry_ptr->header.destroy_in_progress ) && - ( check[i].in_cache ) && - ( entry_ptr->header.size != check[i].expected_size ) ) { - - HDfprintf(stdout, - "(!destroy in progress and in cache and size (expected) = %d (%d).\n", - (int)(entry_ptr->header.size), - (int)(check[i].expected_size)); - } - - if ( entry_ptr->at_main_addr != check[i].at_main_addr ) { - - HDfprintf(stdout, - "(%d,%d) at main addr (expected) = %d (%d).\n", - (int)(check[i].entry_type), - (int)(check[i].entry_index), - (int)(entry_ptr->at_main_addr), - (int)(check[i].at_main_addr)); - } - - if ( entry_ptr->is_dirty != check[i].is_dirty ) { - - HDfprintf(stdout, - "entry_ptr->is_dirty (expected) = %d (%d).\n", - (int)(entry_ptr->is_dirty), - (int)(check[i].is_dirty)); - } - - if ( entry_ptr->header.is_dirty != check[i].is_dirty ) { - - HDfprintf(stdout, - "entry_ptr->header.is_dirty (expected) = %d (%d).\n", - (int)(entry_ptr->header.is_dirty), - (int)(check[i].is_dirty)); - } - - if ( entry_ptr->is_protected != check[i].is_protected ) { - - HDfprintf(stdout, - "entry_ptr->is_protected (expected) = %d (%d).\n", - (int)(entry_ptr->is_protected), - (int)(check[i].is_protected)); - } - - if ( entry_ptr->header.is_protected != check[i].is_protected ) { - - HDfprintf(stdout, - "entry_ptr->header.is_protected (expected) = %d (%d).\n", - (int)(entry_ptr->is_protected), - (int)(check[i].is_protected)); - } - - if ( entry_ptr->is_pinned != check[i].is_pinned ) { - - HDfprintf(stdout, - "entry_ptr->is_pinned (expected) = %d (%d).\n", - (int)(entry_ptr->is_pinned), - (int)(check[i].is_pinned)); - } - - if ( entry_ptr->header.is_pinned != check[i].is_pinned ) { - - HDfprintf(stdout, - "entry_ptr->header.is_pinned (expected) = %d (%d).\n", - (int)(entry_ptr->header.is_pinned), - (int)(check[i].is_pinned)); - } - - if ( entry_ptr->deserialized != check[i].expected_deserialized ) { - - HDfprintf(stdout, - "entry_ptr->deserialized (expected) = %d (%d).\n", - (int)(entry_ptr->deserialized), - (int)(check[i].expected_deserialized)); - } - - if ( entry_ptr->serialized != check[i].expected_serialized ) { - - HDfprintf(stdout, - "entry_ptr->serialized (expected) = %d (%d).\n", - (int)(entry_ptr->serialized), - (int)(check[i].expected_serialized)); - } - - if ( entry_ptr->destroyed != check[i].expected_destroyed ) { - - HDfprintf(stdout, \ - "entry_ptr->destroyed (expected) = %d (%d).\n", - (int)(entry_ptr->destroyed), - (int)(check[i].expected_destroyed)); - } -#endif pass = FALSE; HDsnprintf(msg, (size_t)128, "Check2 failed on entry %d after flush op test #%d.", i, test_num); @@ -8592,19 +8354,6 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu * Programmer: John Mainzer * 10/3/06 * - * Modifications: - * - * Updated test for minor changes in the behaviour - * of H5C__flush_single_entry(). - * - * JRM -- 2/16/15 - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/16/20 - * *------------------------------------------------------------------------- */ @@ -9854,15 +9603,6 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) * Programmer: John Mainzer * 1/12/05 * - * Modifications: - * - * JRM -- 3/29/06 - * Added tests for pinned entries. - * - * JRM -- 5/17/06 - * Complete rewrite of pinned entry tests to accommodate - * the new H5C_mark_entry_dirty() call. - * *------------------------------------------------------------------------- */ @@ -11047,14 +10787,6 @@ check_flush_cache__single_entry(H5F_t *file_ptr) * Programmer: John Mainzer * 1/12/05 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -11121,17 +10853,6 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty (entry_ptr->serialized != expected_serialized) || (entry_ptr->destroyed != expected_destroyed)) { -#if 0 /* This is useful debugging code -- lets keep it for a while */ - - HDfprintf(stdout, - "desrlzd = %d(%d), srlzd = %d(%d), dest = %d(%d)\n", - (int)(entry_ptr->deserialized), - (int)expected_deserialized, - (int)(entry_ptr->serialized), - (int)expected_serialized, - (int)(entry_ptr->destroyed), - (int)expected_destroyed); -#endif pass = FALSE; HDsnprintf(msg, (size_t)128, "Unexpected entry status after flush in single entry test #%d.", test_num); @@ -11186,21 +10907,6 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty * Programmer: John Mainzer * 3/28/06 * - * Modifications: - * - * JRM -- 5/17/06 - * Added the pop_mark_dirty_prot and pop_mark_dirty_pinned - * flags and supporting code to allow us to test the - * H5C_mark_entry_dirty() call. Use the - * call to mark the entry dirty while the entry is protected - * if pop_mark_dirty_prot is TRUE, and to mark the entry - * dirty while it is pinned if pop_mark_dirty_pinned is TRUE. - * - * JRM -- 5/14/20 - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * *------------------------------------------------------------------------- */ @@ -11280,16 +10986,6 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e (entry_ptr->serialized != expected_serialized) || (entry_ptr->destroyed != expected_destroyed)) { -#if 0 /* this is useful debugging code -- keep it around */ - HDfprintf(stdout, - "desrlzd = %d(%d), srlzd = %d(%d), dest = %d(%d)\n", - (int)(entry_ptr->deserialized), - (int)expected_deserialized, - (int)(entry_ptr->serialized), - (int)expected_serialized, - (int)(entry_ptr->destroyed), - (int)expected_destroyed); -#endif pass = FALSE; HDsnprintf(msg, (size_t)128, "Unexpected entry status after flush in pinned single entry test #%d.", test_num); @@ -11361,8 +11057,6 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e * Programmer: John Mainzer * 4/28/06 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -11581,9 +11275,6 @@ check_get_entry_status(unsigned paged) * Programmer: John Mainzer * 7/5/06 * - * Modifications: - * - * *------------------------------------------------------------------------- */ @@ -11863,10 +11554,6 @@ check_expunge_entry(unsigned paged) * Programmer: John Mainzer * 4/1/07 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ static unsigned @@ -12353,10 +12040,6 @@ check_move_entry(unsigned paged) * Programmer: John Mainzer * 4/27/06 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -12509,8 +12192,6 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry * Programmer: John Mainzer * 4/28/06 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -12612,12 +12293,6 @@ check_pin_protected_entry(unsigned paged) * Programmer: John Mainzer * 7/7/06 * - * Modifications: - * - * Updated function to allow for disabling of the slist. - * - * JRM -- 5/18/20 - * *------------------------------------------------------------------------- */ @@ -13480,12 +13155,6 @@ check_resize_entry(unsigned paged) * Programmer: John Mainzer * 8/2/07 * - * Modifications: - * - * Updated function to allow for disabling of the slist. - * - * JRM -- 5/18/20 - * *------------------------------------------------------------------------- */ @@ -14130,13 +13799,6 @@ check_evictions_enabled(unsigned paged) * Programmer: John Mainzer * 6/24/04 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -14229,9 +13891,6 @@ check_flush_protected_err(unsigned paged) * Programmer: John Mainzer * 4/7/06 * - * Modifications: - * - * *------------------------------------------------------------------------- */ static unsigned @@ -14316,8 +13975,6 @@ check_destroy_pinned_err(unsigned paged) * Programmer: John Mainzer * 6/24/04 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -14412,8 +14069,6 @@ check_destroy_protected_err(unsigned paged) * Programmer: John Mainzer * 6/24/04 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -14494,10 +14149,6 @@ check_duplicate_insert_err(unsigned paged) * Programmer: John Mainzer * 4/24/06 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -14583,10 +14234,6 @@ check_double_pin_err(unsigned paged) * Programmer: John Mainzer * 4/24/06 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -14681,10 +14328,6 @@ check_double_unpin_err(unsigned paged) * Programmer: John Mainzer * 4/24/06 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -15035,10 +14678,6 @@ check_mark_entry_dirty_errs(unsigned paged) * Programmer: John Mainzer * 7/6/06 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -15490,10 +15129,6 @@ check_unprotect_ro_dirty_err(unsigned paged) * Programmer: John Mainzer * 4/9/07 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -15706,10 +15341,6 @@ check_protect_retries(unsigned paged) * Programmer: John Mainzer * 8/3/07 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -19710,12 +19341,6 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) * Programmer: John Mainzer * 12/16/04 * - * Modifications: - * - * Added code to include the flash cache size increment - * code in this test. - * JRM -- 1/10/08 - * *------------------------------------------------------------------------- */ @@ -22312,8 +21937,6 @@ check_auto_cache_resize_disable(unsigned paged) * Programmer: John Mainzer * 12/16/04 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -22999,13 +22622,6 @@ check_auto_cache_resize_epoch_markers(unsigned paged) * Programmer: John Mainzer * 10/29/04 * - * Modifications: - * - * Added code to verify that errors in the flash cache size - * increment related fields are caught as well. - * - * JRM -- 1/17/08 - * *------------------------------------------------------------------------- */ @@ -25236,8 +24852,6 @@ check_auto_cache_resize_input_errs(unsigned paged) * Programmer: John Mainzer * 11/4/04 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -25255,11 +24869,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) uint32_t cur_num_entries; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, -#if 1 /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, -#else - /* H5C_auto_resize_report_fcn rpt_fcn = */ H5C_def_auto_resize_rpt_fcn, -#endif /* hbool_t set_initial_size = */ TRUE, /* size_t initial_size = */ (1 * 1024 * 1024), @@ -25296,8 +24906,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) /* int32_t epochs_before_eviction = */ 3, /* hbool_t apply_empty_reserve = */ TRUE, - /* double empty_reserve = */ 0.5 - }; + /* double empty_reserve = */ 0.5}; if (paged) TESTING("automatic cache resize auxiliary functions (paged aggregation)"); @@ -25738,8 +25347,6 @@ check_auto_cache_resize_aux_fcns(unsigned paged) * Programmer: Mike McGreevy * 12/16/08 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -28650,14 +28257,6 @@ done: * Programmer: Quincey Koziol * 3/17/09 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -32207,10 +31806,6 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) * Programmer: John Mainzer * 4/3/15 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ static unsigned @@ -32304,14 +31899,6 @@ check_entry_deletions_during_scans(unsigned paged) * Programmer: John Mainzer * 4/4/15 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -32544,14 +32131,6 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) * Programmer: John Mainzer * 4/4/15 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -32906,14 +32485,6 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) * Programmer: John Mainzer * 4/4/15 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -33366,14 +32937,6 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) * Programmer: John Mainzer * 4/9/15 * - * Modifications: - * - * Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -33673,8 +33236,6 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) * Programmer: John Mainzer * 4/12/15 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -33755,18 +33316,6 @@ check_stats(unsigned paged) * Programmer: John Mainzer * 4/22/15 * - * Modifications: - * - * Modified slist stats checks to allow for the case that - * the slist is disabled. - * - * Also added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via the - * H5C_FLUSH_CACHE macro. - * - * JRM -- 5/14/20 - * - * *------------------------------------------------------------------------- */ #if H5C_COLLECT_CACHE_STATS diff --git a/test/cache_api.c b/test/cache_api.c index e325069..a34a6ca 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -759,14 +759,6 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) pass = FALSE; failure_mssg = "H5Fget_mdc_hit_rate() returned unexpected hit rate.\n"; } -#if 0 /* this may be useful now and then -- keep it around */ - else { - - HDfprintf(stdout, - "H5Fget_mdc_hit_rate() reports hit_rate = %lf:\n", - hit_rate); - } -#endif } if (pass) { @@ -782,16 +774,6 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) pass = FALSE; failure_mssg = "H5Fget_mdc_size() returned unexpected value(s).\n"; } -#if 0 /* this may be useful now and then -- keep it around */ - else { - - HDfprintf(stdout, "H5Fget_mdc_size() reports:\n"); - HDfprintf(stdout, " max_size: %ld, min_clean_size: %ld\n", - (long)max_size, (long)min_clean_size); - HDfprintf(stdout, " cur_size: %ld, cur_num_entries: %d\n", - (long)cur_size, cur_num_entries); - } -#endif } /* close the file and delete it */ @@ -1254,27 +1236,13 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (data_chunk[k][l] != ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)) { valid_chunk = FALSE; -#if 0 /* this will be useful from time to time -- lets keep it*/ - HDfprintf(stdout, - "data_chunk[%0d][%0d] = %0d, expect %0d.\n", - k, l, data_chunk[k][l], - ((DSET_SIZE * DSET_SIZE * m) + - (DSET_SIZE * (i + k)) + j + l)); - HDfprintf(stdout, - "m = %d, i = %d, j = %d, k = %d, l = %d\n", - m, i, j, k, l); -#endif } } } if (!valid_chunk) { -#if 1 pass = FALSE; failure_mssg = "slab validation failed."; -#else /* as above */ - HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m); -#endif } } @@ -1366,12 +1334,6 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) valid_chunk = FALSE; } -#if 0 /* this will be useful from time to time -- lets keep it */ - HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", - k, l, data_chunk[k][l], - ((DSET_SIZE * DSET_SIZE * m) + - (DSET_SIZE * (i + k)) + j + l)); -#endif } } @@ -1379,10 +1341,6 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) pass = FALSE; failure_mssg = "slab validation failed."; -#if 0 /* as above */ - HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", - i, j, m); -#endif } } diff --git a/test/cache_common.c b/test/cache_common.c index df08e25..d4bab3b 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -2664,11 +2664,6 @@ verify_unprotected(void) * Programmer: John Mainzer * 7/6/06 * - * Changes: Added code to set entry_ptr->expunged to TRUE if - * H5C_expunge_entry() returns without error. - * - * JRM -- 8/21/14 - * *------------------------------------------------------------------------- */ @@ -2727,19 +2722,6 @@ expunge_entry(H5F_t *file_ptr, int32_t type, int32_t idx) * Programmer: John Mainzer * 6/23/04 * - * Changes: Added code to setup and take down the skip list before - * and after calls to H5C_flush_cache(). Do this via calls - * to the H5C_FLUSH_CACHE macro. - * - * This is necessary, as H5C_flush() is called repeatedly - * during file flush. If we setup and took down the - * skip list on H5C_flush_cache(), we would find ourselves - * doing this repeatedly -- which is contrary to the - * objective of the exercise (avoiding as many skip list - * operations as possible). - * - * JRM -- 5/14/20 - * *------------------------------------------------------------------------- */ @@ -3512,11 +3494,6 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) * Programmer: John Mainzer * 6/12/04 * - * Changes: Updated slist size == dirty index size checks to - * bypass the test if cache_ptr->slist_enabled is FALSE. - * - * JRM -- 5/8/20 - * *------------------------------------------------------------------------- */ void diff --git a/test/cache_common.h b/test/cache_common.h index 28d3a65..bdeeded 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -141,8 +141,6 @@ * Programmer: John Mainzer * 5/14/20 * - * Changes: None. - * ***********************************************************************/ #define H5C_FLUSH_CACHE(file, flags, fail_mssg) \ diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 9f4072e..73d0459 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -127,13 +127,6 @@ typedef struct { * Programmer: Robb Matzke * Friday, January 23, 1998 * - * Modifications: - * Robb Matzke, 1999-06-23 - * If the command line switch `--noopt' is present then the fast - * compound datatype conversion is turned off. - * - * Raymond Lu, 15 June 2007 - * Moved this part of code from MAIN to TEST_COMPOUND function. *------------------------------------------------------------------------- */ static unsigned @@ -820,7 +813,6 @@ error: * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static void @@ -862,7 +854,6 @@ initialize_stype1(unsigned char *buf, size_t num) * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static void @@ -908,7 +899,6 @@ initialize_stype2(unsigned char *buf, size_t num) * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static void @@ -938,7 +928,6 @@ initialize_stype3(unsigned char *buf, size_t num) * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static void @@ -990,7 +979,6 @@ initialize_stype4(unsigned char *buf, size_t num) * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static hid_t @@ -1045,7 +1033,6 @@ error: * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static hid_t @@ -1103,7 +1090,6 @@ error: * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static hid_t @@ -1145,7 +1131,6 @@ error: * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static hid_t @@ -1206,7 +1191,6 @@ error: * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static int @@ -1289,7 +1273,6 @@ error: * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static unsigned @@ -1496,7 +1479,6 @@ error: * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ static unsigned @@ -1705,7 +1687,6 @@ error: * Programmer: Neil Fortner * Thursday, 22 January 2009 * - * Modifications: *------------------------------------------------------------------------- */ static unsigned @@ -1981,7 +1962,6 @@ error: * Programmer: Neil Fortner * Monday, 19 October 2009 * - * Modifications: *------------------------------------------------------------------------- */ static unsigned @@ -2222,7 +2202,6 @@ error: * Programmer: Raymond Lu * Friday, 15 June 2007 * - * Modifications: *------------------------------------------------------------------------- */ int diff --git a/test/dangle.c b/test/dangle.c index 660b54f..36984b8 100644 --- a/test/dangle.c +++ b/test/dangle.c @@ -39,8 +39,6 @@ const char *FILENAME[] = {"dangle", NULL}; * Programmer: Quincey Koziol * Tuesday, May 13, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -138,8 +136,6 @@ error: * Programmer: Quincey Koziol * Tuesday, May 13, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -233,8 +229,6 @@ error: * Programmer: Quincey Koziol * Tuesday, May 13, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -331,8 +325,6 @@ error: * Programmer: Quincey Koziol * Thursday, August 25, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -418,8 +410,6 @@ error: * Programmer: Quincey Koziol * Wednesday, June 18, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -652,8 +642,6 @@ error: * Programmer: Quincey Koziol * Tuesday, May 13, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/dsets.c b/test/dsets.c index 6592d17..fc3de08 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -2495,11 +2495,7 @@ error: *------------------------------------------------------------------------- */ static herr_t -test_filters(hid_t file, hid_t -#ifndef H5_HAVE_FILTER_SZIP - H5_ATTR_UNUSED -#endif /* H5_HAVE_FILTER_SZIP */ - fapl) +test_filters(hid_t file) { hid_t dc; /* Dataset creation property list ID */ const hsize_t chunk_size[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2}; /* Chunk dimensions */ @@ -15728,7 +15724,7 @@ main(void) nerrors += (test_compact_open_close_dirty(my_fapl) < 0 ? 1 : 0); nerrors += (test_conv_buffer(file) < 0 ? 1 : 0); nerrors += (test_tconv(file) < 0 ? 1 : 0); - nerrors += (test_filters(file, my_fapl) < 0 ? 1 : 0); + nerrors += (test_filters(file) < 0 ? 1 : 0); nerrors += (test_onebyte_shuffle(file) < 0 ? 1 : 0); nerrors += (test_nbit_int(file) < 0 ? 1 : 0); nerrors += (test_nbit_float(file) < 0 ? 1 : 0); diff --git a/test/dt_arith.c b/test/dt_arith.c index 6d6cb4c..c006c49 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -403,8 +403,6 @@ static int my_isinf(int endian, const unsigned char *val, size_t size, size_t mp * Programmer: Robb Matzke * Monday, July 6, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -430,8 +428,6 @@ fpe_handler(int H5_ATTR_UNUSED signo) * Programmer: Robb Matzke * Monday, November 16, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -472,8 +468,6 @@ reset_hdf5(void) * Programmer: Raymond Lu * April 19, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static H5T_conv_ret_t @@ -518,8 +512,6 @@ except_func(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5 * Programmer: Raymond Lu * Friday, Sept 2, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -582,8 +574,6 @@ error: * Programmer: Raymond Lu * Sept 7, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static H5T_conv_ret_t @@ -803,8 +793,6 @@ error: * Programmer: Raymond Lu * Thursday, Jan 6, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1254,8 +1242,6 @@ error: * Programmer: Raymond Lu * Saturday, Jan 29, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1575,8 +1561,6 @@ error: * Programmer: Robb Matzke * Monday, November 16, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2628,8 +2612,6 @@ error: * Programmer: Robb Matzke * Friday, April 30, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2680,8 +2662,6 @@ test_conv_int_2(void) * Programmer: Robb Matzke * Monday, July 6, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2756,8 +2736,6 @@ my_isnan(dtype_t type, void *val) * Programmer: Raymond Lu * Monday, June 20, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2796,13 +2774,6 @@ my_isinf(int endian, const unsigned char *val, size_t size, size_t mpos, size_t * Programmer: Robb Matzke * Tuesday, June 23, 1998 * - * Modifications: - * Albert Cheng, Apr 16, 2004 - * Check for underflow condition. If the src number is - * smaller than the dst MIN float number, consider it okay - * if the converted sw and hw dst are both less than or - * equal to the dst MIN float number. - * *------------------------------------------------------------------------- */ static int @@ -2828,7 +2799,6 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) unsigned char *hw = NULL; /*ptr to hardware-conv'd*/ int underflow; /*underflow occurred */ int overflow = 0; /*overflow occurred */ - int uflow = 0; /*underflow debug counters*/ size_t j, k; /*counters */ int sendian; /* source type endianness */ int dendian; /* Destination type endianness */ @@ -3118,9 +3088,6 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) } #endif } - if (underflow) { - uflow++; - } /* For Intel machines, the size of "long double" is 12 bytes, precision * is 80 bits; for Intel IA64 and AMD processors, the size of "long double" @@ -3404,8 +3371,6 @@ error: * Programmer: Raymond Lu * Thursday, November 6, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4606,8 +4571,6 @@ error: * Programmer: Raymond Lu * Monday, Nov 17, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static hbool_t @@ -4692,8 +4655,6 @@ done: * Programmer: Robb Matzke * Tuesday, November 24, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4854,8 +4815,6 @@ run_integer_tests(const char *name) * Programmer: Raymond Lu * Tuesday, March 22, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4939,8 +4898,6 @@ done: * Programmer: Raymond Lu * Monday, November 10, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -5047,8 +5004,6 @@ run_int_fp_conv(const char *name) * Programmer: Raymond Lu * Monday, November 10, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -5195,12 +5150,6 @@ run_fp_int_conv(const char *name) * Programmer: Robb Matzke * Tuesday, December 9, 1997 * - * Modifications: - * Raymond Lu - * Monday, April 4, 2005 - * These tests were split from dtypes.c because dtypes.c - * has grown too big. - * *------------------------------------------------------------------------- */ int diff --git a/test/dtypes.c b/test/dtypes.c index cffc08f..37fc8c7 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -341,11 +341,6 @@ error: * Programmer: Quincey Koziol * Saturday, August 30, 2003 * - * Modifications: - * Raymond Lu - * 8 December 2009 - * I added a field of VL string in the compound type to test - * H5Tdetect_class correctly detect it as string type. *------------------------------------------------------------------------- */ static int @@ -1347,11 +1342,6 @@ error: * Programmer: Quincey Koziol * Tuesday, December 18, 2001 * - * Modifications: - * The size of compound datatype can be expanded now. - * Raymond Lu - * Wednesday, September 10, 2003 - * *------------------------------------------------------------------------- */ static int @@ -1496,11 +1486,6 @@ error: * Programmer: Robb Matzke * Wednesday, January 7, 1998 * - * Modifications: - * Raymond Lu - * 27 June 2008 - * Added verification of compound type size for H5Tpack and - * test for array of nested compound type. *------------------------------------------------------------------------- */ static int @@ -2019,8 +2004,6 @@ error: * Programmer: Raymond Lu * Tuesday, June 15, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2233,8 +2216,6 @@ error: * Programmer: Quincey Koziol * Saturday, August 7, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2516,8 +2497,6 @@ error: * Programmer: Raymond Lu * Wednesday, September 29, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2737,9 +2716,9 @@ error: * Function: test_compound_14 * * Purpose: Tests compound type conversions where a vlen string will - be misaligned in the conversion buffer and the file. The - two compound types are meant to trigger two different - conversion routines. + * be misaligned in the conversion buffer and the file. The + * two compound types are meant to trigger two different + * conversion routines. * * Return: Success: 0 * @@ -2748,8 +2727,6 @@ error: * Programmer: Neil Fortner * Monday, August 25, 2008 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3204,8 +3181,6 @@ error: * Programmer: Neil Fortner * Friday, September 19, 2008 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3379,8 +3354,6 @@ error: * Programmer: Ray Lu * 14 July 2022 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3507,8 +3480,6 @@ error: * Programmer: Neil Fortner * Friday, October 3, 2008 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3621,8 +3592,6 @@ error: * Programmer: Neil Fortner * Tuesday, January 13, 2009 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3927,11 +3896,6 @@ error: * Programmer: Raymond Lu * Thursday, April 4, 2002 * - * Modifications: - * Raymond Lu - * Wednesday, February 9, 2005 - * Added test for H5Tenum_valueof, H5Tenum_nameof, and - * H5Tget_member_value. *------------------------------------------------------------------------- */ static int @@ -4174,8 +4138,6 @@ error: * Programmer: Robb Matzke * Thursday, June 4, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4331,8 +4293,6 @@ error: * Programmer: Robb Matzke * Monday, June 1, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -5285,8 +5245,6 @@ error: * Programmer: Robb Matzke * Tuesday, January 5, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -6014,13 +5972,6 @@ error: * Programmer: Raymond Lu * July 14, 2004 * - * Modifications: Raymond Lu - * July 13, 2009 - * Added the test for VL string types. - * - * Raymond Lu - * 17 February 2011 - * I added the test of reference count for decoded datatypes. *------------------------------------------------------------------------- */ static int @@ -6810,8 +6761,6 @@ conv_except(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5 * make it portable to other architectures, but further * input and changes are welcome. -QAK * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -8695,9 +8644,9 @@ test_versionbounds(void) H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */ hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ int low, high; /* Indices for iterating over versions */ - H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, - H5F_LIBVER_V114}; - int versions_count = 5; /* Number of version bounds in the array */ + H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, + H5F_LIBVER_V112, H5F_LIBVER_V114, H5F_LIBVER_V114}; + int versions_count = 6; /* Number of version bounds in the array */ unsigned highest_version; /* Highest version in nested datatypes */ color_t enum_val; /* Enum type index */ herr_t ret = 0; /* Generic return value */ @@ -8,7 +8,6 @@ * distribution tree, or in https://www.hdfgroup.org/licenses. * * If you do not have access to either file, you may request a copy from * * help@hdfgroup.org. * - * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* Programmer: Neil Fortner diff --git a/test/enum.c b/test/enum.c index 780da74..592236a 100644 --- a/test/enum.c +++ b/test/enum.c @@ -33,8 +33,6 @@ typedef enum { E1_RED, E1_GREEN, E1_BLUE, E1_WHITE, E1_BLACK } c_e1; * Programmer: Robb Matzke * Wednesday, December 23, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -315,8 +313,6 @@ error: * Programmer: Robb Matzke * Monday, January 4, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -419,8 +415,6 @@ error: * Programmer: Robb Matzke * Tuesday, January 5, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -530,8 +524,6 @@ error: * Programmer: Elena Pourmal * Wednesday, June 7, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -622,8 +614,6 @@ error: * Programmer: Raymond Lu * Tuesday, April 4, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -757,8 +747,6 @@ error: * Programmer: Robb Matzke * Tuesday, December 22, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/file_image.c b/test/file_image.c index 0398c15..e9f50c3 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -699,10 +699,6 @@ error: * Programmer: John Mainzer * Tuesday, November 15, 2011 * - * Modifications: - * Vailin Choi; July 2013 - * Add the creation of user block to the file as indicated by the parameter "user". - * ****************************************************************************** */ /* Disable warning for "format not a string literal" here -QAK */ @@ -1343,10 +1339,6 @@ error: return 1; } /* test_get_file_image_error_rejection() */ -/* - * Modifications: - * Add testing for file image with or without user block in the file. - */ int main(void) { diff --git a/test/fillval.c b/test/fillval.c index 008833d..489aa76 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -62,8 +62,6 @@ typedef struct { * Programmer: Raymond Lu * Monday, Jan 26, 2001 * - * Modifications: - * *------------------------------------------------------------------------- */ static hid_t @@ -159,8 +157,6 @@ error: * Programmer: Robb Matzke * Thursday, October 1, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -404,10 +400,6 @@ error: * Programmer: Robb Matzke * Thursday, October 1, 1998 * - * Modifications: - * Many new cases have been added to this test since - * the fill value design has been modified. - * *------------------------------------------------------------------------- */ static int @@ -866,10 +858,6 @@ error: * Programmer: Robb Matzke * Thursday, October 1, 1998 * - * Modifications: - * This function is called by test_rdwr to write and read - * dataset for different cases. - * *------------------------------------------------------------------------- */ static int @@ -1207,10 +1195,6 @@ error: * Programmer: Robb Matzke * Thursday, October 1, 1998 * - * Modifications: - * Many new cases have been added to this test since the - * fill value design is modified. - * *------------------------------------------------------------------------- */ static int @@ -2060,8 +2044,6 @@ error: * Programmer: Robb Matzke * Monday, October 5, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2224,8 +2206,6 @@ skip: * Programmer: Raymond Lu * Feb 27, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2379,11 +2359,6 @@ error: * Programmer: Joel Plutchak * April 15, 2013 * - * Modifications: - * This function is called by test_rdwr to write and read - * dataset for different cases of chunked datasets with - * unallocated chunks. - * *------------------------------------------------------------------------- */ diff --git a/test/filter_fail.c b/test/filter_fail.c index d413b07..172027c 100644 --- a/test/filter_fail.c +++ b/test/filter_fail.c @@ -97,11 +97,6 @@ filter_fail(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned * Programmer: Raymond Lu * 25 August 2010 * - * Modifications: - * Raymond Lu - * 5 Oct 2010 - * Test when the chunk cache is enable and disabled to make - * sure the library behaves properly. *------------------------------------------------------------------------- */ static herr_t @@ -237,8 +232,6 @@ error: * Programmer: Raymond Lu * 25 August 2010 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t diff --git a/test/gen_cross.c b/test/gen_cross.c index 98c6fd7..c468039 100644 --- a/test/gen_cross.c +++ b/test/gen_cross.c @@ -88,8 +88,6 @@ int create_nbit_dsets_float(hid_t fid, hid_t fsid, hid_t msid); * Programmer: Raymond Lu * Some time ago * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -194,8 +192,6 @@ error: * Programmer: Neil Fortner * 27 January 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -284,8 +280,6 @@ error: * Programmer: Raymond Lu * 21 January 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -374,8 +368,6 @@ error: * Programmer: Neil Fortner * 27 January 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -472,8 +464,6 @@ error: * Programmer: Neil Fortner * 27 January 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -570,8 +560,6 @@ error: * Programmer: Raymond Lu * 21 January 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -669,8 +657,6 @@ error: * Programmer: Neil Fortner * 27 January 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -767,8 +753,6 @@ error: * Programmer: Raymond Lu * 29 March 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -857,8 +841,6 @@ error: * Programmer: Raymond Lu * 29 March 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -958,8 +940,6 @@ error: * Programmer: Raymond Lu * 29 March 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -1049,8 +1029,6 @@ error: * Programmer: Raymond Lu * 29 March 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -1139,8 +1117,6 @@ error: * Programmer: Raymond Lu * 29 March 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/gen_filters.c b/test/gen_filters.c index d82a3eb..c171538 100644 --- a/test/gen_filters.c +++ b/test/gen_filters.c @@ -228,8 +228,6 @@ error: * * Return: Success: * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/gen_new_array.c b/test/gen_new_array.c index e04b71a..1db1c69 100644 --- a/test/gen_new_array.c +++ b/test/gen_new_array.c @@ -50,8 +50,6 @@ * Programmer: Robb Matzke * Monday, October 26, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/gen_new_mtime.c b/test/gen_new_mtime.c index 7632769..87a104a 100644 --- a/test/gen_new_mtime.c +++ b/test/gen_new_mtime.c @@ -39,8 +39,6 @@ * Programmer: Quincey Koziol * Friday, January 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/gen_noencoder.c b/test/gen_noencoder.c index fe9cea6..a0be0ef 100644 --- a/test/gen_noencoder.c +++ b/test/gen_noencoder.c @@ -24,8 +24,6 @@ * Programmer: James Laird and Nat Furrer * Thursday, July 1, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/gen_old_array.c b/test/gen_old_array.c index ab0ea20..2e6e953 100644 --- a/test/gen_old_array.c +++ b/test/gen_old_array.c @@ -49,8 +49,6 @@ * Programmer: Robb Matzke * Monday, October 26, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/gen_old_layout.c b/test/gen_old_layout.c index b7a9b3d..a18e7fb 100644 --- a/test/gen_old_layout.c +++ b/test/gen_old_layout.c @@ -45,8 +45,6 @@ * Programmer: Quincey Koziol * Friday, January 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/gen_old_mtime.c b/test/gen_old_mtime.c index 9645a5e..d67d018 100644 --- a/test/gen_old_mtime.c +++ b/test/gen_old_mtime.c @@ -39,8 +39,6 @@ * Programmer: Quincey Koziol * Friday, January 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/gen_sizes_lheap.c b/test/gen_sizes_lheap.c index dc55d81..c30b811 100644 --- a/test/gen_sizes_lheap.c +++ b/test/gen_sizes_lheap.c @@ -36,8 +36,6 @@ * Programmer: Neil Fortner * Thursday, July 15, 2010 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/h5test.c b/test/h5test.c index b4bf102..1797df9 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -131,8 +131,6 @@ static char *h5_fixname_real(const char *base_name, hid_t fapl, const char *_su * Programmer: Robb Matzke * Wednesday, March 4, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -917,8 +915,6 @@ error: * Programmer: Robb Matzke * Friday, November 20, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ void @@ -937,8 +933,6 @@ h5_no_hwconv(void) * Programmer: Albert Cheng * 2002/04/22 * - * Modifications: - * *------------------------------------------------------------------------- */ void @@ -1009,12 +1003,6 @@ h5_show_hostname(void) * object. * Return: 0 if all is fine; otherwise non-zero. * Programmer: Albert Cheng, 2002/05/21. - * Modifications: - * Bill Wendling, 2002/05/31 - * Modified so that the HDF5_MPI_INFO environment variable can - * be a semicolon separated list of "key=value" pairings. Most - * of the code is to remove any whitespaces which might be - * surrounding the "key=value" pairs. */ int h5_set_info_object(void) @@ -1108,7 +1096,6 @@ h5_set_info_object(void) * Purpose: Display content of an MPI Info object * Return: void * Programmer: Albert Cheng 2002/05/21 - * Modifications: */ void h5_dump_info_object(MPI_Info info) @@ -1338,8 +1325,6 @@ print_func(const char *format, ...) * * Programmer: * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -1390,11 +1375,6 @@ h5_szip_can_encode(void) * Programmer: Leon Arber * 4/4/05 * - * Modifications: - * Use original getenv if MPI is not initialized. This happens - * one uses the PHDF5 library to build a serial nature code. - * Albert 2006/04/07 - * *------------------------------------------------------------------------- */ char * @@ -1552,7 +1532,7 @@ h5_verify_cached_stabs_cb(hid_t oid, const char H5_ATTR_UNUSED *name, const H5O_ /*------------------------------------------------------------------------- * Function: h5_verify_cached_stabs * - * Purpose: Verify that all groups in every file in base_name have + * Purpose: Verifies that all groups in every file in base_name have * their symbol table information cached (if present, and if * the parent group also uses a symbol table). Does not * check that the root group's symbol table information is @@ -1565,8 +1545,6 @@ h5_verify_cached_stabs_cb(hid_t oid, const char H5_ATTR_UNUSED *name, const H5O_ * Programmer: Neil Fortner * Tuesday, April 12, 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ herr_t diff --git a/test/hdfs.c b/test/hdfs.c index 06cd7cc..bf8e840 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -404,8 +404,6 @@ static H5FD_hdfs_fapl_t default_fa = { * Programmer: Jacob Smith * 2018-04-25 * - * Changes: None. - * *--------------------------------------------------------------------------- */ static int @@ -614,8 +612,6 @@ error: * Programmer: Jacob Smith * 2018-04-25 * - * Changes: None. - * *------------------------------------------------------------------------- */ static int @@ -1383,10 +1379,6 @@ error: * Programmer: Jacob Smith * 2017-11-06 * - * Changes: - * + modify from S3VFD codebase to HDFS; Minor changes, mostly. - * + Jacob Smith 2018-06-08 - * *--------------------------------------------------------------------------- */ static int @@ -1529,10 +1521,6 @@ test_cmp(void) * Programmer: Jacob Smith * 2017-11-07 * - * Changes: - * + modify from S3VFD codebase to HDFS; Minor changes, mostly. - * + Jacob Smith 2018-06-08 - * *--------------------------------------------------------------------------- */ static int diff --git a/test/istore.c b/test/istore.c index 916cf67..b688acd 100644 --- a/test/istore.c +++ b/test/istore.c @@ -94,8 +94,6 @@ is_sparse(void) * Programmer: Robb Matzke * Friday, October 10, 1997 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -137,13 +135,6 @@ print_array(uint8_t *array, size_t nx, size_t ny, size_t nz) * Programmer: Robb Matzke * Wednesday, October 15, 1997 * - * Modifications: - * Converted to use datasets instead of directly messing with - * the istore routines, etc. since the new raw data architecture - * performs hyperslab operations at a higher level than the - * istore routines did and the new istore routines can't handle - * I/O on more than one chunk at a time. QAK - 2003/04/16 - * *------------------------------------------------------------------------- */ static hid_t @@ -198,8 +189,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 15, 1997 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -246,8 +235,6 @@ test_create(hid_t f, const char *prefix) * Programmer: Robb Matzke * Wednesday, October 15, 1997 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -445,8 +432,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 22, 1997 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t diff --git a/test/links.c b/test/links.c index 0b815e2..9e4d2e3 100644 --- a/test/links.c +++ b/test/links.c @@ -7815,8 +7815,6 @@ error: * Programmer: Quincey Koziol * Tuesday, July 26, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -13717,6 +13715,112 @@ error: } /* end external_link_with_committed_datatype() */ /*------------------------------------------------------------------------- + * Function: external_link_public_macros + * + * Purpose: Test public macros for external links + * + * Return: Success: 0 + * Failure: -1 + *------------------------------------------------------------------------- + */ +static int +external_link_public_macros(hid_t fapl, hbool_t new_format) +{ + hid_t fid = -1; /* File ID */ + H5L_info2_t linfo; /* Link information */ + char objname[NAME_BUF_SIZE]; /* Object name */ + char filename1[NAME_BUF_SIZE]; + char filename2[NAME_BUF_SIZE]; + unsigned flags; /* External link flags, packed as a bitmap */ + const char *file; /* File from external link */ + const char *path; /* Path from external link */ + + if (new_format) + TESTING("external link public macros (w/new group format)"); + else + TESTING("external link public macros"); + + /* Set up filenames */ + h5_fixname(FILENAME[3], fapl, filename1, sizeof filename1); + h5_fixname(FILENAME[4], fapl, filename2, sizeof filename2); + + /* Create file to point to */ + if ((fid = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + TEST_ERROR; + + /* Close file */ + if (H5Fclose(fid) < 0) + TEST_ERROR; + + /* Check that external links are registered with the library */ + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + TEST_ERROR; + + /* Create file with link to first file */ + if ((fid = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + TEST_ERROR; + + /* Create external link to object in first file */ + if (H5Lcreate_external(filename1, "/", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* Check information for external link */ + if (H5Lget_info2(fid, "ext_link", &linfo, H5P_DEFAULT) < 0) + goto error; + + if (H5L_TYPE_EXTERNAL != linfo.type) { + H5_FAILED(); + HDputs(" Unexpected object type - should have been an external link"); + goto error; + } + + if (H5Lget_val(fid, "ext_link", objname, sizeof(objname), H5P_DEFAULT) < 0) + TEST_ERROR; + + if (H5Lunpack_elink_val(objname, linfo.u.val_size, &flags, &file, &path) < 0) + TEST_ERROR; + + if (HDstrcmp(file, filename1) != 0) { + H5_FAILED(); + HDputs(" External link file name incorrect"); + goto error; + } + + if (HDstrcmp(path, "/") != 0) { + H5_FAILED(); + HDputs(" External link path incorrect"); + goto error; + } + + /* External link version & flags */ + if (flags != ((H5L_EXT_VERSION << 4) | H5L_EXT_FLAGS_ALL)) { + H5_FAILED(); + HDputs(" External link version or flags are incorrect"); + goto error; + } + + /* Close first file */ + if (H5Fclose(fid) < 0) + TEST_ERROR; + + /* Check that all file IDs have been closed */ + if (H5I_nmembers(H5I_FILE) != 0) + TEST_ERROR; + H5F_sfile_assert_num(0); + + PASSED(); + return SUCCEED; + +error: + H5E_BEGIN_TRY + { + H5Fclose(fid); + } + H5E_END_TRY; + return FAIL; +} /* end external_link_public_macros() */ + +/*------------------------------------------------------------------------- * Function: ud_hard_links * * Purpose: Check that the functionality of hard links can be duplicated @@ -22717,6 +22821,7 @@ main(void) nerrors += external_dont_fail_to_source(my_fapl, new_format) < 0 ? 1 : 0; nerrors += external_open_twice(my_fapl, new_format) < 0 ? 1 : 0; nerrors += external_link_with_committed_datatype(my_fapl, new_format) < 0 ? 1 : 0; + nerrors += external_link_public_macros(my_fapl, new_format) < 0 ? 1 : 0; } /* with/without external file cache */ } diff --git a/test/links_env.c b/test/links_env.c index 0bd2add..27e29ea 100644 --- a/test/links_env.c +++ b/test/links_env.c @@ -48,8 +48,6 @@ static int external_link_env(hid_t fapl, hbool_t new_format); * Programmer: Vailin Choi * Feb. 20, 2008 * - * Modifications: - * *------------------------------------------------------------------------- */ static int diff --git a/test/mount.c b/test/mount.c index c5a04b5..6807f36 100644 --- a/test/mount.c +++ b/test/mount.c @@ -41,8 +41,6 @@ int bm[NX][NY], bm_out[NX][NY]; /* Data buffers */ * Programmer: Robb Matzke * Wednesday, October 7, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -116,8 +114,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 7, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -172,8 +168,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 7, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -461,8 +455,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 7, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -561,8 +553,6 @@ error: * Programmer: Robb Matzke * Tuesday, October 13, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -650,8 +640,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 7, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -720,8 +708,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 7, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -790,8 +776,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 7, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -859,8 +843,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 14, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -934,8 +916,6 @@ error: * Programmer: Robb Matzke * Tuesday, October 13, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1088,8 +1068,6 @@ error: * Programmer: Robb Matzke * Tuesday, October 13, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1151,8 +1129,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 14, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1273,8 +1249,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 14, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1352,8 +1326,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 14, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1442,8 +1414,6 @@ error: * Programmer: Quincey Koziol * Wednesday, May 4, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1677,8 +1647,6 @@ error: * Programmer: Quincey Koziol * Monday, June 6, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1946,8 +1914,6 @@ error: * Programmer: Quincey Koziol * Thursday, June 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2098,8 +2064,6 @@ error: * Programmer: Quincey Koziol * Tuesday, July 5, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2228,8 +2192,6 @@ error: * Programmer: Quincey Koziol * Thursday, July 14, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2384,8 +2346,6 @@ error: * Programmer: Quincey Koziol * Tuesday, July 19, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2528,8 +2488,6 @@ error: * Programmer: Quincey Koziol * Tuesday, July 19, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2671,8 +2629,6 @@ error: * Programmer: Quincey Koziol * Tuesday, July 19, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2813,8 +2769,6 @@ error: * Programmer: Quincey Koziol * Tuesday, July 19, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3017,8 +2971,6 @@ error: * Programmer: Quincey Koziol * Monday, July 25, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3240,8 +3192,6 @@ error: * Programmer: Quincey Koziol * Monday, July 25, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3453,8 +3403,6 @@ error: * Programmer: Quincey Koziol * Monday, July 25, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3624,8 +3572,6 @@ error: * Programmer: Quincey Koziol * Monday, July 25, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4016,8 +3962,6 @@ error: * Programmer: Quincey Koziol * Monday, July 25, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4181,8 +4125,6 @@ error: * Programmer: Neil Fortner * Friday, August 1, 2008 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4287,8 +4229,6 @@ error: * Programmer: Neil Fortner * Friday, August 6, 2008 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4446,8 +4386,6 @@ error: * Programmer: Neil Fortner * Friday, November 14, 2008 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4600,8 +4538,6 @@ error: * Programmer: Robb Matzke * Wednesday, October 7, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/mtime.c b/test/mtime.c index 8391def..882189e 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -39,13 +39,6 @@ const char *FILENAME[] = {"mtime", NULL}; * Programmer: Robb Matzke * Thursday, July 30, 1998 * - * Modifications: - * Added checks for old and new modification time messages - * in pre-created datafiles (generated with gen_old_mtime.c and - * gen_new_mtime.c). - * Quincey Koziol - * Friday, January 3, 2003 - * *------------------------------------------------------------------------- */ int diff --git a/test/ntypes.c b/test/ntypes.c index b825ecd..92b2896 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -63,8 +63,6 @@ const char *FILENAME[] = {"ntypes", NULL}; * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -314,8 +312,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -644,8 +640,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -857,8 +851,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -1098,8 +1090,6 @@ error: * Programmer: Quincey Koziol * January 31, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -1325,8 +1315,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -1484,8 +1472,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -1672,8 +1658,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -1824,8 +1808,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -2030,8 +2012,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -2170,8 +2150,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -2292,8 +2270,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -2465,8 +2441,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -2679,8 +2653,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -2778,11 +2750,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * Raymond Lu - * 1 December 2009 - * I added the support for bitfield and changed the test to - * compare the data being read back. *------------------------------------------------------------------------- */ static herr_t @@ -2937,8 +2904,6 @@ error: * Programmer: Pedro Vicente * September 3, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -3145,8 +3110,6 @@ error: * Programmer: Raymond Lu * October 15, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/page_buffer.c b/test/page_buffer.c index d588d30..a6f7f0a 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -554,21 +554,8 @@ error: * Programmer: unknown * ?? / ?? / ?? * - * Changes: Added base_page_cnt field as supporting code. This allows - * the test to adjust to the number of page buffer pages - * accessed during file open / create. - * - * The test for the value of base_page_cnt just after file - * open exists detect changes in library behavior. Assuming - * any such change is not indicative of other issues, these - * tests can be modified to reflect the change. - * - * JRM -- 2/23/17 - * *------------------------------------------------------------------------- */ - -/* Changes due to file space page size has a minimum size of 512 */ static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) { @@ -832,18 +819,6 @@ error: * Programmer: unknown * ?? / ?? / ?? * - * Changes: Added base_page_cnt field as supporting code. This allows - * the test to adjust to the number of page buffer pages - * accessed during file open / create. - * - * The test for the value of base_page_cnt just after file - * open exists detect changes in library behavior. Assuming - * any such change is not indicative of other issues, these - * tests can be modified to reflect the change. - * - * JRM -- 2/23/17 - * - * *------------------------------------------------------------------------- */ @@ -1086,19 +1061,6 @@ error: * Programmer: unknown * ?? / ?? / ?? * - * Changes: Added the base_raw_cnt and base_meta_cnt fields and - * supporting code. This allows the test to adjust to the - * number of page buffer pages accessed during file open / - * create. - * - * The tests for the values of base_raw_cnt and base_meta_cnt - * just after file open exist detect changes in library - * behavior. Assuming any such change is not indicative of - * other issues, these tests can be modified to reflect the - * change. - * - * JRM -- 2/23/17 - * *------------------------------------------------------------------------- */ @@ -1721,19 +1683,6 @@ error: * Programmer: unknown * ?? / ?? / ?? * - * Changes: Added the base_raw_cnt and base_meta_cnt fields and - * supporting code. This allows the test to adjust to the - * number of page buffer pages accessed during file open / - * create. - * - * The tests for the values of base_raw_cnt and base_meta_cnt - * just after file open exist detect changes in library - * behavior. Assuming any such change is not indicative of - * other issues, these tests can be modified to reflect the - * change. - * - * JRM -- 2/23/17 - * *------------------------------------------------------------------------- */ static unsigned @@ -2024,8 +1973,6 @@ error: * Programmer: John Mainzer * 03/21/17 * - * Changes: None. - * *------------------------------------------------------------------------- */ diff --git a/test/reserved.c b/test/reserved.c index d0e0c85..a820344 100644 --- a/test/reserved.c +++ b/test/reserved.c @@ -30,8 +30,6 @@ const char *FILENAME[] = {"rsrv_heap", "rsrv_ohdr", "rsrv_vlen", NULL}; * Nat Furrer * Friday, May 28, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -165,8 +163,6 @@ error: * Nat Furrer * Friday, May 28, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -309,8 +305,6 @@ error: * Nat Furrer * Thursday, July 1, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -471,8 +465,6 @@ error: * Programmer: Nat Furrer and James Laird * Thursday, July 1, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/s3comms.c b/test/s3comms.c index d68cc84..45978fb 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -1759,8 +1759,6 @@ error: * * Programmer: Jacob Smith 2018-01-24 * - * Changes: None - * *--------------------------------------------------------------------------- */ static herr_t @@ -1813,8 +1811,6 @@ error: * * Programmer: Jacob Smith 2018-01-?? * - * Changes: None - * *--------------------------------------------------------------------------- */ static herr_t diff --git a/test/space_overflow.c b/test/space_overflow.c index 41530fd..d31b52d 100644 --- a/test/space_overflow.c +++ b/test/space_overflow.c @@ -37,8 +37,6 @@ * Programmer: Robb Matzke * Monday, October 26, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/stab.c b/test/stab.c index 26cb015..697bce0 100644 --- a/test/stab.c +++ b/test/stab.c @@ -191,7 +191,6 @@ error: * * Programmer: Robb Matzke 2002-03-28 * - * Modifications: *------------------------------------------------------------------------- */ static int @@ -1405,8 +1404,6 @@ error: * Programmer: Robb Matzke * Tuesday, November 24, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/test/tarray.c b/test/tarray.c index c2cc279..06eac90 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -2244,5 +2244,9 @@ test_array(void) void cleanup_array(void) { - HDremove(FILENAME); + H5E_BEGIN_TRY + { + H5Fdelete(FILENAME, H5P_DEFAULT); + } + H5E_END_TRY; } /* end cleanup_array() */ diff --git a/test/tattr.c b/test/tattr.c index f77f793..5dd5736 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -247,7 +247,11 @@ test_attr_basic_write(hid_t fapl) CHECK(attr, FAIL, "H5Acreate2"); /* Try to create the same attribute again (should fail) */ - ret_id = H5Acreate2(dataset, ATTR1_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Acreate2(dataset, ATTR1_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write attribute information */ @@ -388,7 +392,11 @@ test_attr_basic_write(hid_t fapl) VERIFY(attr_size, (ATTR2_DIM1 * ATTR2_DIM2 * sizeof(int)), "H5Aget_storage_size"); /* Try to create the same attribute again (should fail) */ - ret_id = H5Acreate2(group, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Acreate2(group, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write attribute information */ @@ -541,7 +549,7 @@ test_attr_flush(hid_t fapl) CHECK(att, FAIL, "H5Acreate2"); ret = H5Aread(att, H5T_NATIVE_DOUBLE, &rdata); - CHECK(ret, FAIL, "H5Awrite"); + CHECK(ret, FAIL, "H5Aread"); if (!H5_DBL_ABS_EQUAL(rdata, 0.0)) TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n", rdata, 0.0); @@ -757,7 +765,11 @@ test_attr_compound_write(hid_t fapl) CHECK(attr, FAIL, "H5Acreate2"); /* Try to create the same attribute again (should fail) */ - ret_id = H5Acreate2(dataset, ATTR4_NAME, tid1, sid2, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Acreate2(dataset, ATTR4_NAME, tid1, sid2, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write complex attribute data */ @@ -978,7 +990,11 @@ test_attr_scalar_write(hid_t fapl) CHECK(attr, FAIL, "H5Acreate2"); /* Try to create the same attribute again (should fail) */ - ret_id = H5Acreate2(dataset, ATTR5_NAME, H5T_NATIVE_FLOAT, sid2, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Acreate2(dataset, ATTR5_NAME, H5T_NATIVE_FLOAT, sid2, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write attribute information */ @@ -1121,7 +1137,11 @@ test_attr_mult_write(hid_t fapl) CHECK(attr, FAIL, "H5Acreate2"); /* Try to create the same attribute again (should fail) */ - ret_id = H5Acreate2(dataset, ATTR1_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Acreate2(dataset, ATTR1_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write 1st attribute data */ @@ -1145,7 +1165,11 @@ test_attr_mult_write(hid_t fapl) CHECK(attr, FAIL, "H5Acreate2"); /* Try to create the same attribute again (should fail) */ - ret_id = H5Acreate2(dataset, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Acreate2(dataset, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write 2nd attribute information */ @@ -1169,7 +1193,11 @@ test_attr_mult_write(hid_t fapl) CHECK(attr, FAIL, "H5Acreate2"); /* Try to create the same attribute again (should fail) */ - ret_id = H5Acreate2(dataset, ATTR3_NAME, H5T_NATIVE_DOUBLE, sid2, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Acreate2(dataset, ATTR3_NAME, H5T_NATIVE_DOUBLE, sid2, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Acreate2"); /* Write 3rd attribute information */ @@ -1547,7 +1575,7 @@ test_attr_delete(hid_t fapl) herr_t ret; /* Generic return value */ /* Output message about test being performed */ - MESSAGE(5, ("Testing Basic Attribute Functions\n")); + MESSAGE(5, ("Testing Basic Attribute Deletion Functions\n")); /* Open file */ fid1 = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl); @@ -1563,7 +1591,11 @@ test_attr_delete(hid_t fapl) VERIFY(oinfo.num_attrs, 3, "H5Oget_info3"); /* Try to delete bogus attribute */ - ret = H5Adelete(dataset, "Bogus"); + H5E_BEGIN_TRY + { + ret = H5Adelete(dataset, "Bogus"); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Adelete"); /* Verify the correct number of attributes */ @@ -2254,7 +2286,11 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Aclose"); /* Attempt to add attribute again, which should fail */ - attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(attr, FAIL, "H5Acreate2"); /* Close dataspace */ @@ -4200,7 +4236,11 @@ test_attr_deprec(hid_t fcpl, hid_t fapl) CHECK(dataset, FAIL, "H5Dopen2"); /* Get number of attributes with bad ID */ - ret = H5Aget_num_attrs((hid_t)-1); + H5E_BEGIN_TRY + { + ret = H5Aget_num_attrs((hid_t)-1); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_num_attrs"); /* Get number of attributes */ @@ -4408,7 +4448,11 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl) VERIFY(crt_order_flags, 0, "H5Pget_attr_creation_order"); /* Setting invalid combination of a attribute order creation order indexing on should fail */ - ret = H5Pset_attr_creation_order(dcpl, H5P_CRT_ORDER_INDEXED); + H5E_BEGIN_TRY + { + ret = H5Pset_attr_creation_order(dcpl, H5P_CRT_ORDER_INDEXED); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Pset_attr_creation_order"); ret = H5Pget_attr_creation_order(dcpl, &crt_order_flags); CHECK(ret, FAIL, "H5Pget_attr_creation_order"); @@ -5459,13 +5503,9 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) hsize_t corder_count; /* # of records in creation order index */ unsigned reopen_file; /* Whether to re-open the file before deleting group */ char attrname[NAME_BUF_SIZE]; /* Name of attribute */ -#ifdef LATER - h5_stat_size_t empty_size; /* Size of empty file */ - h5_stat_size_t file_size; /* Size of file after operating on it */ -#endif /* LATER */ - unsigned curr_dset; /* Current dataset to work on */ - unsigned u; /* Local index variable */ - herr_t ret; /* Generic return value */ + unsigned curr_dset; /* Current dataset to work on */ + unsigned u; /* Local index variable */ + herr_t ret; /* Generic return value */ /* Output message about test being performed */ MESSAGE(5, ("Testing Deleting Object w/Dense Attribute Storage and Creation Order Info\n")); @@ -5492,24 +5532,6 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) ret = H5Pget_attr_phase_change(dcpl, &max_compact, &min_dense); CHECK(ret, FAIL, "H5Pget_attr_phase_change"); -/* XXX: Try to find a way to resize dataset's object header so that the object - * header can have one chunk, then retrieve "empty" file size and check - * that size after everything is deleted -QAK - */ -#ifdef LATER - /* Create empty file */ - fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); - CHECK(fid, FAIL, "H5Fcreate"); - - /* Close file */ - ret = H5Fclose(fid); - CHECK(ret, FAIL, "H5Fclose"); - - /* Get the size of an empty file */ - empty_size = h5_get_file_size(FILENAME); - CHECK(empty_size, FAIL, "h5_get_file_size"); -#endif /* LATER */ - /* Loop to leave file open when deleting dataset, or to close & re-open file * before deleting dataset */ for (reopen_file = FALSE; reopen_file <= TRUE; reopen_file++) { @@ -5622,13 +5644,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Fclose"); } /* end if */ -#ifdef LATER - /* Get the size of the file now */ - file_size = h5_get_file_size(FILENAME); - CHECK(file_size, FAIL, "h5_get_file_size"); - VERIFY(file_size, empty_size, "h5_get_file_size"); -#endif /* LATER */ - } /* end for */ + } /* end for */ /* Close property list */ ret = H5Pclose(dcpl); @@ -5886,11 +5902,19 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); /* Check for query on non-existent attribute */ - ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_info_by_idx"); - ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, - tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, + tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_name_by_idx"); /* Create attributes, up to limit of compact form */ @@ -5923,14 +5947,26 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); /* Check for out of bound offset queries */ - ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_info_by_idx"); - ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_info_by_idx"); - ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, - tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, + tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_name_by_idx"); /* Create more attributes, to push into dense form */ @@ -5976,14 +6012,26 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Check for out of bound offset queries */ - ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_info_by_idx"); - ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_info_by_idx"); - ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, - tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, + tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aget_name_by_idx"); } /* end for */ @@ -6267,6 +6315,8 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ + MESSAGE(5, ("Testing Deleting Attribute By Index\n")) + /* Create dataspace for dataset & attributes */ sid = H5Screate(H5S_SCALAR); CHECK(sid, FAIL, "H5Screate"); @@ -6374,7 +6424,11 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); /* Check for deleting non-existent attribute */ - ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Adelete_by_idx"); /* Create attributes, up to limit of compact form */ @@ -6408,7 +6462,11 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); /* Check for out of bound deletions */ - ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6536,7 +6594,11 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Check for out of bound deletion */ - ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6600,7 +6662,11 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); /* Check for deletion on empty attribute storage again */ - ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -6767,7 +6833,11 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); /* Check for deletion on empty attribute storage again */ - ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Adelete_by_idx"); } /* end for */ @@ -7012,7 +7082,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx if (iter_info->visited[v] == TRUE) nvisit++; - VERIFY(skip, (max_attrs / 2), "H5Aiterate2"); + VERIFY(nvisit, max_attrs, "H5Aiterate2"); } /* end else */ /* Skip over some attributes on object */ @@ -7043,7 +7113,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx if (iter_info->visited[v] == TRUE) nvisit++; - VERIFY(skip, (max_attrs / 2), "H5Aiterate_by_name"); + VERIFY(nvisit, max_attrs, "H5Aiterate_by_name"); } /* end else */ /* Skip over some attributes on object */ @@ -7074,7 +7144,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx if (iter_info->visited[v] == TRUE) nvisit++; - VERIFY(skip, (max_attrs / 2), "H5Aiterate_by_name"); + VERIFY(nvisit, max_attrs, "H5Aiterate_by_name"); } /* end else */ #ifndef H5_NO_DEPRECATED_SYMBOLS @@ -7106,7 +7176,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx if (iter_info->visited[v] == TRUE) nvisit++; - VERIFY(skip, (max_attrs / 2), "H5Aiterate1"); + VERIFY(nvisit, max_attrs, "H5Aiterate1"); } /* end else */ #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -7162,15 +7232,29 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx /* Check for iteration routine indicating failure */ skip = 0; - ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_fail_cb, NULL); + H5E_BEGIN_TRY + { + ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_fail_cb, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate2"); skip = 0; - ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_fail_cb, NULL, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_fail_cb, NULL, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate_by_name"); skip = 0; - ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_fail_cb, NULL, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = + H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_fail_cb, NULL, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Retrieve current # of errors */ @@ -7373,17 +7457,29 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Check for out of bound iteration */ idx = u; - ret = H5Aiterate2(my_dataset, idx_type, order, &idx, attr_iterate2_cb, NULL); + H5E_BEGIN_TRY + { + ret = H5Aiterate2(my_dataset, idx_type, order, &idx, attr_iterate2_cb, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate2"); idx = u; - ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &idx, attr_iterate2_cb, NULL, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &idx, attr_iterate2_cb, NULL, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate_by_name"); idx = u; - ret = H5Aiterate_by_name(my_dataset, ".", idx_type, order, &idx, attr_iterate2_cb, NULL, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aiterate_by_name(my_dataset, ".", idx_type, order, &idx, attr_iterate2_cb, + NULL, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Test iteration over attributes stored compactly */ @@ -7460,17 +7556,29 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Check for out of bound iteration */ idx = u; - ret = H5Aiterate2(my_dataset, idx_type, order, &idx, attr_iterate2_cb, NULL); + H5E_BEGIN_TRY + { + ret = H5Aiterate2(my_dataset, idx_type, order, &idx, attr_iterate2_cb, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate2"); idx = u; - ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &idx, attr_iterate2_cb, NULL, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &idx, attr_iterate2_cb, NULL, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate_by_name"); idx = u; - ret = H5Aiterate_by_name(my_dataset, ".", idx_type, order, &idx, attr_iterate2_cb, NULL, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret = H5Aiterate_by_name(my_dataset, ".", idx_type, order, &idx, attr_iterate2_cb, + NULL, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Aiterate_by_name"); /* Test iteration over attributes stored densely */ @@ -7701,8 +7809,12 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); /* Check for opening an attribute on an object with no attributes */ - ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Create attributes, up to limit of compact form */ @@ -7736,8 +7848,12 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); /* Check for out of bound opening an attribute on an object */ - ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Test opening attributes by index stored compactly */ @@ -7810,8 +7926,12 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Check for out of bound opening an attribute on an object */ - ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, - H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, + H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_idx"); /* Test opening attributes by index stored compactly */ @@ -8029,13 +8149,25 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); /* Check for opening a non-existent attribute on an object with no attributes */ - ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen"); - ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_name"); - ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Create attributes, up to limit of compact form */ @@ -8068,13 +8200,25 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); /* Check for opening a non-existent attribute on an object with compact attribute storage */ - ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen"); - ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_name"); - ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Test opening attributes stored compactly */ @@ -8149,13 +8293,25 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Check for opening a non-existent attribute on an object with dense attribute storage */ - ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen"); - ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_name(my_dataset, ".", "foo", H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_name"); - ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + ret_id = H5Aopen_by_name(fid, dsetname, "foo", H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(ret_id, FAIL, "H5Aopen_by_name"); /* Test opening attributes stored compactly */ @@ -10898,8 +11054,8 @@ test_attr_bug8(hid_t fcpl, hid_t fapl) hsize_t dims = 256; /* Attribute dimensions */ H5O_info2_t oinfo; /* Object info */ H5A_info_t ainfo; /* Attribute info */ - haddr_t root_addr; /* Root group address */ - haddr_t link_addr; /* Link (to root group) address */ + H5O_token_t root_token; /* Root group token */ + int cmp_value; /* Result from H5Otoken_cmp */ herr_t ret; /* Generic return status */ /* Output message about test being performed */ @@ -10913,11 +11069,10 @@ test_attr_bug8(hid_t fcpl, hid_t fapl) gid = H5Gcreate2(fid, GROUP1_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); CHECK(gid, FAIL, "H5Gcreate2"); - /* Get root group address */ + /* Get root group token */ ret = H5Oget_info3(fid, &oinfo, H5O_INFO_BASIC); CHECK(ret, FAIL, "H5Oget_info"); - ret = H5VLnative_token_to_addr(fid, oinfo.token, &root_addr); - CHECK(ret, FAIL, "H5VLnative_token_to_addr"); + root_token = oinfo.token; /* * Create link to root group @@ -10942,11 +11097,9 @@ test_attr_bug8(hid_t fcpl, hid_t fapl) CHECK(oid, FAIL, "H5Oopen"); ret = H5Oget_info3(oid, &oinfo, H5O_INFO_BASIC); CHECK(ret, FAIL, "H5Oget_info"); - ret = H5VLnative_token_to_addr(fid, oinfo.token, &link_addr); - CHECK(ret, FAIL, "H5VLnative_token_to_addr"); - if (link_addr != root_addr) - TestErrPrintf("incorrect link target address: addr: %llu, expected: %llu\n", - (long long unsigned)link_addr, (long long unsigned)root_addr); + ret = H5Otoken_cmp(oid, &oinfo.token, &root_token, &cmp_value); + CHECK(ret, FAIL, "H5Otoken_cmp"); + VERIFY(cmp_value, 0, "H5Otoken_cmp"); /* Close file */ ret = H5Fclose(fid); @@ -10990,11 +11143,9 @@ test_attr_bug8(hid_t fcpl, hid_t fapl) CHECK(oid, FAIL, "H5Oopen"); ret = H5Oget_info3(oid, &oinfo, H5O_INFO_BASIC); CHECK(ret, FAIL, "H5Oget_info"); - ret = H5VLnative_token_to_addr(fid, oinfo.token, &link_addr); - CHECK(ret, FAIL, "H5VLnative_token_to_addr"); - if (link_addr != root_addr) - TestErrPrintf("incorrect link target address: addr: %llu, expected: %llu\n", - (long long unsigned)link_addr, (long long unsigned)root_addr); + ret = H5Otoken_cmp(oid, &oinfo.token, &root_token, &cmp_value); + CHECK(ret, FAIL, "H5Otoken_cmp"); + VERIFY(cmp_value, 0, "H5Otoken_cmp"); ret = H5Aget_info_by_name(gid, ".", ATTR1_NAME, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_name"); if (ainfo.data_size != dims) @@ -11504,12 +11655,14 @@ test_attr(void) * Programmer: Albert Cheng * July 2, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_attr(void) { - HDremove(FILENAME); + H5E_BEGIN_TRY + { + H5Fdelete(FILENAME, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/tcheck_version.c b/test/tcheck_version.c index a528f5e..2d5c239 100644 --- a/test/tcheck_version.c +++ b/test/tcheck_version.c @@ -22,8 +22,6 @@ * * Programmer: Albert Cheng * September 20, 2009 - * Modifications: - * Added abort signal intercept. AKC - 2009/10/16 - */ #include "h5test.h" diff --git a/test/tconfig.c b/test/tconfig.c index fdab5ef..ec6bb2c 100644 --- a/test/tconfig.c +++ b/test/tconfig.c @@ -75,8 +75,6 @@ test_configure(void) * Programmer: Albert Cheng * September 25, 2001 * - * Modifications: - * *------------------------------------------------------------------------- */ void @@ -95,10 +93,6 @@ cleanup_configure(void) * Programmer: Albert Cheng * September 25, 2001 * - * Modifications: - * Albert Cheng, 2004/10/14 - * Verified both signed and unsigned int types. - * *------------------------------------------------------------------------- */ void @@ -183,8 +177,6 @@ test_config_ctypes(void) * Programmer: Albert Cheng * October 12, 2009 * - * Modifications: - * *------------------------------------------------------------------------- */ void diff --git a/test/tcoords.c b/test/tcoords.c index cf84aba..230db60 100644 --- a/test/tcoords.c +++ b/test/tcoords.c @@ -713,12 +713,14 @@ test_coords(void) * Programmer: Raymond Lu * 20 Dec. 2007 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_coords(void) { - HDremove(FILENAME); + H5E_BEGIN_TRY + { + H5Fdelete(FILENAME, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/test_plugin.sh.in b/test/test_plugin.sh.in index 02ac21f..1d04760 100644 --- a/test/test_plugin.sh.in +++ b/test/test_plugin.sh.in @@ -109,7 +109,7 @@ if [ $? != 0 ]; then fi # Set plugin path -ENVCMD="env HDF5_PLUGIN_PATH=${TEMP_PLUGIN_DIR}:${TEMP_FILTER_DIR1}:${TEMP_FILTER_DIR2}" +ENVCMD="env HDF5_PLUGIN_PATH=${TEMP_PLUGIN_DIR}:${TEMP_FILTER_DIR1}:${TEMP_FILTER_DIR2}:${HDF5_PLUGIN_PATH}" # Run the tests $ENVCMD $FILTER_TEST_BIN diff --git a/test/test_swmr.pwsh.in b/test/test_swmr.pwsh.in index de7a57a..8f09740 100644 --- a/test/test_swmr.pwsh.in +++ b/test/test_swmr.pwsh.in @@ -85,13 +85,6 @@ function Wait-Message { ############################################################################### ## Main ## -## Modifications: -## Vailin Choi; July 2013 -## Add waiting of message file before launching the reader(s). -## Due to the implementation of file locking, coordination -## is needed in file opening for the writer/reader tests -## to proceed as expected. -## ############################################################################### # Check to see if the VFD specified by the HDF5_DRIVER environment variable diff --git a/test/test_swmr.sh.in b/test/test_swmr.sh.in index aacd575..e4c7546 100644 --- a/test/test_swmr.sh.in +++ b/test/test_swmr.sh.in @@ -83,13 +83,6 @@ WAIT_MESSAGE() { ############################################################################### ## Main ## -## Modifications: -## Vailin Choi; July 2013 -## Add waiting of message file before launching the reader(s). -## Due to the implementation of file locking, coordination -## is needed in file opening for the writer/reader tests -## to proceed as expected. -## ############################################################################### # Check to see if the VFD specified by the HDF5_DRIVER environment variable diff --git a/test/testframe.c b/test/testframe.c index 9bcccd1..f3cf781 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -126,9 +126,6 @@ AddTest(const char *TheName, void (*TheCall)(void), void (*Cleanup)(void), const * private_parser: Optional routine provided by test program to parse the * private options. Default to NULL which means none is provided. * - * Modifications: - * Albert Cheng 2004/08/17 - * Added the ProgName, private_usage and private_parser arguments. */ void TestInit(const char *ProgName, void (*private_usage)(void), int (*private_parser)(int ac, char *av[])) diff --git a/test/tfile.c b/test/tfile.c index 16e55c6..0556b81 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -213,11 +213,13 @@ static void test_rw_noupdate(void); static void test_file_create(void) { - hid_t fid1, fid2, fid3; /* HDF5 File IDs */ - hid_t tmpl1, tmpl2; /* file creation templates */ - hsize_t ublock; /* sizeof userblock */ - size_t parm; /* file-creation parameters */ - size_t parm2; /* file-creation parameters */ + hid_t fid1 = H5I_INVALID_HID; + hid_t fid2 = H5I_INVALID_HID; + hid_t fid3 = H5I_INVALID_HID; /* HDF5 File IDs */ + hid_t tmpl1, tmpl2; /* file creation templates */ + hsize_t ublock; /* sizeof userblock */ + size_t parm; /* file-creation parameters */ + size_t parm2; /* file-creation parameters */ unsigned iparm; unsigned iparm2; herr_t ret; /*generic return value */ @@ -226,10 +228,18 @@ test_file_create(void) MESSAGE(5, ("Testing Low-Level File Creation I/O\n")); /* First ensure the file does not exist */ - HDremove(FILE1); + H5E_BEGIN_TRY + { + H5Fdelete(FILE1, H5P_DEFAULT); + } + H5E_END_TRY; /* Try opening a non-existent file */ - fid1 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT); + H5E_BEGIN_TRY + { + fid1 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(fid1, FAIL, "H5Fopen"); /* Test create with various sequences of H5F_ACC_EXCL and */ @@ -243,21 +253,33 @@ test_file_create(void) * try to create the same file with H5F_ACC_TRUNC. This should fail * because fid1 is the same file and is currently open. */ - fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fcreate"); /* Close all files */ ret = H5Fclose(fid1); CHECK(ret, FAIL, "H5Fclose"); - ret = H5Fclose(fid2); + H5E_BEGIN_TRY + { + ret = H5Fclose(fid2); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Fclose"); /*file should not have been open */ /* * Try again with H5F_ACC_EXCL. This should fail because the file already * exists from the previous steps. */ - fid1 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + fid1 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(fid1, FAIL, "H5Fcreate"); /* Test create with H5F_ACC_TRUNC. This will truncate the existing file. */ @@ -268,14 +290,22 @@ test_file_create(void) * Try to truncate first file again. This should fail because fid1 is the * same file and is currently open. */ - fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fcreate"); /* * Try with H5F_ACC_EXCL. This should fail too because the file already * exists. */ - fid2 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); + H5E_BEGIN_TRY + { + fid2 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fcreate"); /* Get the file-creation template */ @@ -301,12 +331,6 @@ test_file_create(void) ret = H5Pclose(tmpl1); CHECK(ret, FAIL, "H5Pclose"); -#ifdef LATER - /* Double-check that the atom has been vaporized */ - ret = H5Pclose(tmpl1); - VERIFY(ret, FAIL, "H5Pclose"); -#endif - if (h5_using_default_driver(NULL)) { /* Create a new file with a non-standard file-creation template */ @@ -598,11 +622,19 @@ test_file_open(const char *env_h5_drvr) CHECK(ret, FAIL, "H5Fclose"); /* Open file for second time, which should fail. */ - fid2 = H5Fopen(FILE2, H5F_ACC_RDWR, fapl_id); + H5E_BEGIN_TRY + { + fid2 = H5Fopen(FILE2, H5F_ACC_RDWR, fapl_id); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fopen"); /* Check that the intent fails for an invalid ID */ - ret = H5Fget_intent(fid1, &intent); + H5E_BEGIN_TRY + { + ret = H5Fget_intent(fid1, &intent); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Fget_intent"); /* Close dataset from first open */ @@ -662,7 +694,12 @@ test_file_reopen(void) CHECK(ret, FAIL, "H5Fclose"); ret = H5Fclose(rfid); CHECK(ret, FAIL, "H5Fclose"); - HDremove(REOPEN_FILE); + + H5E_BEGIN_TRY + { + H5Fdelete(REOPEN_FILE, H5P_DEFAULT); + } + H5E_END_TRY; } /* test_file_reopen() */ @@ -681,6 +718,9 @@ test_file_close(void) H5F_close_degree_t fc_degree; herr_t ret; + /* Output message about test being performed */ + MESSAGE(5, ("Testing File Closing with file close degrees\n")); + /* Test behavior while opening file multiple times with different * file close degree value */ @@ -697,7 +737,11 @@ test_file_close(void) VERIFY(fc_degree, H5F_CLOSE_STRONG, "H5Pget_fclose_degree"); /* should fail */ - fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + H5E_BEGIN_TRY + { + fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -751,7 +795,11 @@ test_file_close(void) CHECK(ret, FAIL, "H5Pset_fclose_degree"); /* should fail */ - fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + H5E_BEGIN_TRY + { + fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_STRONG); @@ -784,7 +832,11 @@ test_file_close(void) CHECK(ret, FAIL, "H5Pset_fclose_degree"); /* should fail */ - fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + H5E_BEGIN_TRY + { + fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_SEMI); @@ -799,12 +851,20 @@ test_file_close(void) /* Close first open, should fail since it is SEMI and objects are * still open. */ - ret = H5Fclose(fid1); + H5E_BEGIN_TRY + { + ret = H5Fclose(fid1); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Fclose"); /* Close second open, should fail since it is SEMI and objects are * still open. */ - ret = H5Fclose(fid2); + H5E_BEGIN_TRY + { + ret = H5Fclose(fid2); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Fclose"); ret = H5Dclose(dataset_id); @@ -822,11 +882,19 @@ test_file_close(void) /* Close second open, should fail since it is SEMI and one group ID is * still open. */ - ret = H5Fclose(fid2); + H5E_BEGIN_TRY + { + ret = H5Fclose(fid2); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Fclose"); /* Same check with H5Idec_ref() (should fail also) */ - ret = H5Idec_ref(fid2); + H5E_BEGIN_TRY + { + ret = H5Idec_ref(fid2); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Idec_ref"); ret = H5Gclose(group_id3); @@ -848,7 +916,11 @@ test_file_close(void) CHECK(ret, FAIL, "H5Pset_fclose_degree"); /* should fail */ - fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + H5E_BEGIN_TRY + { + fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -897,7 +969,11 @@ test_file_close(void) CHECK(ret, FAIL, "H5Pset_fclose_degree"); /* should fail */ - fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + H5E_BEGIN_TRY + { + fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, fapl_id); + } + H5E_END_TRY; VERIFY(fid2, FAIL, "H5Fopen"); ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -1101,6 +1177,8 @@ test_get_obj_ids(void) ssize_t oid_list_size = NDSETS; char gname[64], dname[64]; + MESSAGE(5, ("Testing retrieval of object IDs\n")); + /* Create a new file */ fid = H5Fcreate(FILE7, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(fid, FAIL, "H5Fcreate"); @@ -1196,11 +1274,15 @@ test_get_obj_ids(void) /* Get the list of all opened objects */ ret_count = H5Fget_obj_ids((hid_t)H5F_OBJ_ALL, H5F_OBJ_ALL, (size_t)oid_count, oid_list); CHECK(ret_count, FAIL, "H5Fget_obj_ids"); - VERIFY(ret_count, NDSETS, "H5Fget_obj_count"); + VERIFY(ret_count, NDSETS, "H5Fget_obj_ids"); - /* Close all open objects with H5Oclose */ - for (n = 0; n < oid_count; n++) - H5Oclose(oid_list[n]); + H5E_BEGIN_TRY + { + /* Close all open objects with H5Oclose */ + for (n = 0; n < oid_count; n++) + H5Oclose(oid_list[n]); + } + H5E_END_TRY; HDfree(oid_list); } @@ -1220,6 +1302,8 @@ test_get_file_id(void) unsigned intent; herr_t ret; + MESSAGE(5, ("Testing H5Iget_file_id\n")); + /* Create a file */ fid = H5Fcreate(FILE4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(fid, FAIL, "H5Fcreate"); @@ -2870,7 +2954,7 @@ test_file_double_datatype_open(void) herr_t ret; /* Generic return value */ /* Output message about test being performed */ - MESSAGE(5, ("Testing double dataset open\n")); + MESSAGE(5, ("Testing double datatype open\n")); file1_id = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(file1_id, FAIL, "H5Fcreate"); @@ -5587,7 +5671,11 @@ test_libver_bounds_copy(void) CHECK(ret, FAIL, "H5Fclose"); /* Remove the destination file */ - HDremove(DST_FILE); + H5E_BEGIN_TRY + { + H5Fdelete(DST_FILE, H5P_DEFAULT); + } + H5E_END_TRY; } /* end test_libver_bounds_copy() */ @@ -8137,8 +8225,6 @@ test_file(void) * Programmer: Albert Cheng * July 2, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ void diff --git a/test/tgenprop.c b/test/tgenprop.c index 9c4495b..5751ce7 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -194,8 +194,12 @@ test_genprop_basic_class_prop(void) CHECK_I(ret, "H5Pregister2"); /* Try to insert the first property again (should fail) */ - ret = - H5Pregister2(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + H5E_BEGIN_TRY + { + ret = H5Pregister2(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL, + NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Pregister2"); /* Check the existence of the first property */ @@ -218,8 +222,12 @@ test_genprop_basic_class_prop(void) CHECK_I(ret, "H5Pregister2"); /* Try to insert the second property again (should fail) */ - ret = - H5Pregister2(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + H5E_BEGIN_TRY + { + ret = H5Pregister2(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL, + NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Pregister2"); /* Check the existence of the second property */ @@ -260,7 +268,11 @@ test_genprop_basic_class_prop(void) CHECK_I(ret, "H5Punregister"); /* Try to check the size of the first property (should fail) */ - ret = H5Pget_size(cid1, PROP1_NAME, &size); + H5E_BEGIN_TRY + { + ret = H5Pget_size(cid1, PROP1_NAME, &size); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Pget_size"); /* Check the number of properties in class */ @@ -1950,7 +1962,11 @@ test_genprop_deprec_class(void) CHECK_I(ret, "H5Pregister1"); /* Try to insert the first property again (should fail) */ - ret = H5Pregister1(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL); + H5E_BEGIN_TRY + { + ret = H5Pregister1(cid1, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Pregister1"); /* Check the existence of the first property */ @@ -1972,7 +1988,11 @@ test_genprop_deprec_class(void) CHECK_I(ret, "H5Pregister1"); /* Try to insert the second property again (should fail) */ - ret = H5Pregister1(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL); + H5E_BEGIN_TRY + { + ret = H5Pregister1(cid1, PROP2_NAME, PROP2_SIZE, PROP2_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Pregister1"); /* Check the existence of the second property */ @@ -2012,7 +2032,11 @@ test_genprop_deprec_class(void) CHECK_I(ret, "H5Punregister"); /* Try to check the size of the first property (should fail) */ - ret = H5Pget_size(cid1, PROP1_NAME, &size); + H5E_BEGIN_TRY + { + ret = H5Pget_size(cid1, PROP1_NAME, &size); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Pget_size"); /* Check the number of properties in class */ @@ -2164,12 +2188,14 @@ test_genprop(void) * Programmer: Quincey Koziol * June 8, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_genprop(void) { - HDremove(FILENAME); + H5E_BEGIN_TRY + { + H5Fdelete(FILENAME, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/th5o.c b/test/th5o.c index 3e7c80a..027445e 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -49,6 +49,9 @@ test_h5o_open(void) H5T_class_t type_class; /* Class of the datatype */ herr_t ret; /* Value returned from API calls */ + /* Output message about test being performed */ + MESSAGE(5, ("Testing H5Oopen\n")); + h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename); /* Create a new HDF5 file */ @@ -161,6 +164,9 @@ test_h5o_close(void) hsize_t dims[RANK]; herr_t ret; /* Value returned from API calls */ + /* Output message about test being performed */ + MESSAGE(5, ("Testing H5Oclose\n")); + h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename); /* Create a new HDF5 file */ @@ -413,6 +419,9 @@ test_h5o_open_by_token(void) H5T_class_t type_class; /* Class of the datatype */ herr_t ret; /* Value returned from API calls */ + /* Output message about test being performed */ + MESSAGE(5, ("Testing H5Oopen_by_token\n")); + h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename); /* Create a new HDF5 file */ @@ -531,6 +540,9 @@ test_h5o_refcount(void) hsize_t dims[RANK]; herr_t ret; /* Value returned from API calls */ + /* Output message about test being performed */ + MESSAGE(5, ("Testing retrieval of object reference count with H5Oget_info\n")); + h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename); /* Create a new HDF5 file */ @@ -732,6 +744,9 @@ test_h5o_plist(void) unsigned max_compact, min_dense; /* Actual phase change parameters */ herr_t ret; /* Value returned from API calls */ + /* Output message about test being performed */ + MESSAGE(5, ("Testing Object creation properties\n")); + /* Make a FAPL that uses the "use the latest version of the format" flag */ fapl = H5Pcreate(H5P_FILE_ACCESS); CHECK(fapl, FAIL, "H5Pcreate"); @@ -935,6 +950,9 @@ test_h5o_link(void) int i, n; herr_t ret; /* Value returned from API calls */ + /* Output message about test being performed */ + MESSAGE(5, ("Testing H5Olink\n")); + h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename); /* Allocate memory buffers */ @@ -1422,6 +1440,9 @@ test_h5o_getinfo_same_file(void) H5O_info2_t oinfo1, oinfo2; /* Object info structs */ herr_t ret; /* Value returned from API calls */ + /* Output message about test being performed */ + MESSAGE(5, ("Testing H5Oget_info on objects in same file\n")); + h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename); /* Create a new HDF5 file */ @@ -1720,6 +1741,9 @@ test_h5o_getinfo_visit(void) int j; /* Local index variable */ herr_t ret; /* Value returned from API calls */ + /* Output message about test being performed */ + MESSAGE(5, ("Testing info returned by H5Oget_info vs H5Ovisit\n")); + h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename); /* Create an HDF5 file */ diff --git a/test/th5s.c b/test/th5s.c index 77116a6..40d8b06 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -214,14 +214,22 @@ test_h5s_basic(void) /* Verify that incorrect dimensions don't work */ dims1[0] = H5S_UNLIMITED; - sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL); + H5E_BEGIN_TRY + { + sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL); + } + H5E_END_TRY; VERIFY(sid1, FAIL, "H5Screate_simple"); dims1[0] = H5S_UNLIMITED; sid1 = H5Screate(H5S_SIMPLE); CHECK(sid1, FAIL, "H5Screate"); - ret = H5Sset_extent_simple(sid1, SPACE1_RANK, dims1, NULL); + H5E_BEGIN_TRY + { + ret = H5Sset_extent_simple(sid1, SPACE1_RANK, dims1, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Sset_extent_simple"); ret = H5Sclose(sid1); @@ -1626,7 +1634,7 @@ test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, /* Allocate the buffer for encoding */ buf = (char *)HDmalloc(buf_size); - CHECK_PTR(buf, "H5Dmalloc"); + CHECK_PTR(buf, "HDmalloc"); /* Encode according to the setting in in_fapl */ ret = H5Sencode2(in_sid, buf, &buf_size, in_fapl); @@ -3499,16 +3507,18 @@ test_h5s(void) * Programmer: Albert Cheng * July 2, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_h5s(void) { - HDremove(DATAFILE); - HDremove(NULLFILE); - HDremove(BASICFILE); - HDremove(ZEROFILE); - HDremove(VERBFNAME); + H5E_BEGIN_TRY + { + H5Fdelete(DATAFILE, H5P_DEFAULT); + H5Fdelete(NULLFILE, H5P_DEFAULT); + H5Fdelete(BASICFILE, H5P_DEFAULT); + H5Fdelete(ZEROFILE, H5P_DEFAULT); + H5Fdelete(VERBFNAME, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/titerate.c b/test/titerate.c index 48e0aa9..82d8e9f 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -491,7 +491,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) if ((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0) TestErrPrintf("Attribute iteration function didn't return zero correctly!\n"); - /* Test all attributes on dataset, when callback always returns 1 */ + /* Test all attributes on dataset, when callback always returns 2 */ /* This also tests the "restarting" ability, because the index changes */ info.command = RET_TWO; i = 0; @@ -1011,8 +1011,11 @@ test_corrupted_attnamelen(void) hbool_t driver_is_default_compatible; const char *testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */ - const char *err_message = "attribute name has different length than stored length"; - /* the error message produced when the failure occurs */ + /* The error message produced when the failure occurs + * + * FIXME: This is incredibly fragile! + */ + const char *err_message = "ran off end of input buffer while decoding"; /* Output message about test being performed */ MESSAGE(5, ("Testing the Handling of Corrupted Attribute's Name Length\n")); @@ -1203,12 +1206,14 @@ test_iterate(void) * Programmer: Quincey Koziol * April 5, 2000 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_iterate(void) { - HDremove(DATAFILE); + H5E_BEGIN_TRY + { + H5Fdelete(DATAFILE, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/tmeta.c b/test/tmeta.c index f5c5fc1..d55882d 100644 --- a/test/tmeta.c +++ b/test/tmeta.c @@ -121,8 +121,6 @@ test_metadata(void) * Programmer: Albert Cheng * July 2, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ void diff --git a/test/tmisc.c b/test/tmisc.c index 5fb44d4..0b04b2c 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -666,7 +666,7 @@ test_misc4(void) herr_t ret; /* Output message about test being performed */ - MESSAGE(5, ("Testing fileno working in H5O_info_t\n")); + MESSAGE(5, ("Testing fileno working in H5O_info2_t\n")); file1 = H5Fcreate(MISC4_FILE_1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(file1, FAIL, "H5Fcreate"); @@ -1412,7 +1412,11 @@ test_misc8(void) /* Create a contiguous dataset, with space allocation late */ /* Should fail */ - did = H5Dcreate2(fid, MISC8_DSETNAME4, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); + H5E_BEGIN_TRY + { + did = H5Dcreate2(fid, MISC8_DSETNAME4, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(did, FAIL, "H5Dcreate2"); /* Set the space allocation time to incremental */ @@ -1421,7 +1425,11 @@ test_misc8(void) /* Create a contiguous dataset, with space allocation incremental */ /* Should fail */ - did = H5Dcreate2(fid, MISC8_DSETNAME4, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); + H5E_BEGIN_TRY + { + did = H5Dcreate2(fid, MISC8_DSETNAME4, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); + } + H5E_END_TRY; VERIFY(did, FAIL, "H5Dcreate2"); /* Set the space allocation time to early */ @@ -1762,7 +1770,11 @@ test_misc9(void) ret = H5Pset_fapl_core(fapl, (size_t)1024, 0); CHECK(ret, FAIL, "H5Pset_fapl_core"); - fid = H5Fopen(MISC9_FILE, H5F_ACC_RDWR, fapl); + H5E_BEGIN_TRY + { + fid = H5Fopen(MISC9_FILE, H5F_ACC_RDWR, fapl); + } + H5E_END_TRY; VERIFY(fid, FAIL, "H5Fopen"); ret = H5Pclose(fapl); @@ -3948,7 +3960,7 @@ test_misc22(void) unsigned int flags; size_t cd_nelmts = 32; unsigned int cd_values[32]; - unsigned correct; + size_t correct; if (h5_szip_can_encode() != 1) return; @@ -4042,7 +4054,7 @@ test_misc22(void) NULL); CHECK(ret, FAIL, "H5Pget_filter_by_id2"); - VERIFY(cd_values[2], correct, "SZIP filter returned value for precision"); + VERIFY(cd_values[2], (unsigned)correct, "SZIP filter returned value for precision"); ret = H5Dclose(dsid); CHECK(ret, FAIL, "H5Dclose"); @@ -6175,42 +6187,46 @@ test_misc(void) void cleanup_misc(void) { - HDremove(MISC1_FILE); - HDremove(MISC2_FILE_1); - HDremove(MISC2_FILE_2); - HDremove(MISC3_FILE); - HDremove(MISC4_FILE_1); - HDremove(MISC4_FILE_2); - HDremove(MISC5_FILE); - HDremove(MISC6_FILE); - HDremove(MISC7_FILE); - HDremove(MISC8_FILE); - HDremove(MISC9_FILE); - HDremove(MISC10_FILE_NEW); - HDremove(MISC11_FILE); - HDremove(MISC12_FILE); - HDremove(MISC13_FILE_1); - HDremove(MISC13_FILE_2); - HDremove(MISC14_FILE); - HDremove(MISC15_FILE); - HDremove(MISC16_FILE); - HDremove(MISC17_FILE); - HDremove(MISC18_FILE); - HDremove(MISC19_FILE); - HDremove(MISC20_FILE); + H5E_BEGIN_TRY + { + H5Fdelete(MISC1_FILE, H5P_DEFAULT); + H5Fdelete(MISC2_FILE_1, H5P_DEFAULT); + H5Fdelete(MISC2_FILE_2, H5P_DEFAULT); + H5Fdelete(MISC3_FILE, H5P_DEFAULT); + H5Fdelete(MISC4_FILE_1, H5P_DEFAULT); + H5Fdelete(MISC4_FILE_2, H5P_DEFAULT); + H5Fdelete(MISC5_FILE, H5P_DEFAULT); + H5Fdelete(MISC6_FILE, H5P_DEFAULT); + H5Fdelete(MISC7_FILE, H5P_DEFAULT); + H5Fdelete(MISC8_FILE, H5P_DEFAULT); + H5Fdelete(MISC9_FILE, H5P_DEFAULT); + H5Fdelete(MISC10_FILE_NEW, H5P_DEFAULT); + H5Fdelete(MISC11_FILE, H5P_DEFAULT); + H5Fdelete(MISC12_FILE, H5P_DEFAULT); + H5Fdelete(MISC13_FILE_1, H5P_DEFAULT); + H5Fdelete(MISC13_FILE_2, H5P_DEFAULT); + H5Fdelete(MISC14_FILE, H5P_DEFAULT); + H5Fdelete(MISC15_FILE, H5P_DEFAULT); + H5Fdelete(MISC16_FILE, H5P_DEFAULT); + H5Fdelete(MISC17_FILE, H5P_DEFAULT); + H5Fdelete(MISC18_FILE, H5P_DEFAULT); + H5Fdelete(MISC19_FILE, H5P_DEFAULT); + H5Fdelete(MISC20_FILE, H5P_DEFAULT); #ifdef H5_HAVE_FILTER_SZIP - HDremove(MISC21_FILE); - HDremove(MISC22_FILE); + H5Fdelete(MISC21_FILE, H5P_DEFAULT); + H5Fdelete(MISC22_FILE, H5P_DEFAULT); #endif /* H5_HAVE_FILTER_SZIP */ - HDremove(MISC23_FILE); - HDremove(MISC24_FILE); - HDremove(MISC25A_FILE); - HDremove(MISC25C_FILE); - HDremove(MISC26_FILE); - HDremove(MISC28_FILE); - HDremove(MISC29_COPY_FILE); - HDremove(MISC30_FILE); + H5Fdelete(MISC23_FILE, H5P_DEFAULT); + H5Fdelete(MISC24_FILE, H5P_DEFAULT); + H5Fdelete(MISC25A_FILE, H5P_DEFAULT); + H5Fdelete(MISC25C_FILE, H5P_DEFAULT); + H5Fdelete(MISC26_FILE, H5P_DEFAULT); + H5Fdelete(MISC28_FILE, H5P_DEFAULT); + H5Fdelete(MISC29_COPY_FILE, H5P_DEFAULT); + H5Fdelete(MISC30_FILE, H5P_DEFAULT); #ifndef H5_NO_DEPRECATED_SYMBOLS - HDremove(MISC31_FILE); + H5Fdelete(MISC31_FILE, H5P_DEFAULT); #endif /* H5_NO_DEPRECATED_SYMBOLS */ + } + H5E_END_TRY; } /* end cleanup_misc() */ diff --git a/test/trefer.c b/test/trefer.c index cc0ee2c..2c62234 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -205,83 +205,187 @@ test_reference_params(void) CHECK(ret, H5I_INVALID_HID, "H5Dcreate2"); /* Test parameters to H5Rcreate_object */ - ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, NULL); + H5E_BEGIN_TRY + { + ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_object ref"); - ret = H5Rcreate_object(H5I_INVALID_HID, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_object(H5I_INVALID_HID, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_object loc_id"); - ret = H5Rcreate_object(fid1, NULL, H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_object(fid1, NULL, H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_object name"); - ret = H5Rcreate_object(fid1, "", H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_object(fid1, "", H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_object null name"); /* Test parameters to H5Rcreate_region */ - ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, NULL); + H5E_BEGIN_TRY + { + ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_region ref"); - ret = H5Rcreate_region(H5I_INVALID_HID, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_region(H5I_INVALID_HID, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_region loc_id"); - ret = H5Rcreate_region(fid1, NULL, sid1, H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_region(fid1, NULL, sid1, H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_region name"); - ret = H5Rcreate_region(fid1, "/Group1/Dataset1", H5I_INVALID_HID, H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_region(fid1, "/Group1/Dataset1", H5I_INVALID_HID, H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_region dataspace"); /* Test parameters to H5Rcreate_attr */ - ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", "Attr", H5P_DEFAULT, NULL); + H5E_BEGIN_TRY + { + ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", "Attr", H5P_DEFAULT, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_attr ref"); - ret = H5Rcreate_attr(H5I_INVALID_HID, "/Group1/Dataset2", "Attr", H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_attr(H5I_INVALID_HID, "/Group1/Dataset2", "Attr", H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_attr loc_id"); - ret = H5Rcreate_attr(fid1, NULL, "Attr", H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_attr(fid1, NULL, "Attr", H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_attr name"); - ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", NULL, H5P_DEFAULT, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcreate_attr(fid1, "/Group1/Dataset2", NULL, H5P_DEFAULT, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcreate_attr attr_name"); /* Test parameters to H5Rdestroy */ - ret = H5Rdestroy(NULL); + H5E_BEGIN_TRY + { + ret = H5Rdestroy(NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rdestroy"); /* Test parameters to H5Rget_type */ - type = H5Rget_type(NULL); + H5E_BEGIN_TRY + { + type = H5Rget_type(NULL); + } + H5E_END_TRY; VERIFY(type, H5R_BADTYPE, "H5Rget_type ref"); /* Test parameters to H5Requal */ - ret = H5Requal(NULL, &rbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Requal(NULL, &rbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Requal ref1"); - ret = H5Requal(&rbuf[0], NULL); + H5E_BEGIN_TRY + { + ret = H5Requal(&rbuf[0], NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Requal ref2"); /* Test parameters to H5Rcopy */ - ret = H5Rcopy(NULL, &wbuf[0]); + H5E_BEGIN_TRY + { + ret = H5Rcopy(NULL, &wbuf[0]); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcopy src_ref"); - ret = H5Rcopy(&rbuf[0], NULL); + H5E_BEGIN_TRY + { + ret = H5Rcopy(&rbuf[0], NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rcopy dest_ref"); /* Test parameters to H5Ropen_object */ - dset2 = H5Ropen_object(&rbuf[0], H5I_INVALID_HID, H5I_INVALID_HID); + H5E_BEGIN_TRY + { + dset2 = H5Ropen_object(&rbuf[0], H5I_INVALID_HID, H5I_INVALID_HID); + } + H5E_END_TRY; VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object oapl_id"); - dset2 = H5Ropen_object(NULL, H5P_DEFAULT, dapl_id); + H5E_BEGIN_TRY + { + dset2 = H5Ropen_object(NULL, H5P_DEFAULT, dapl_id); + } + H5E_END_TRY; VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object ref"); /* Test parameters to H5Ropen_region */ - ret_id = H5Ropen_region(NULL, H5I_INVALID_HID, H5I_INVALID_HID); + H5E_BEGIN_TRY + { + ret_id = H5Ropen_region(NULL, H5I_INVALID_HID, H5I_INVALID_HID); + } + H5E_END_TRY; VERIFY(ret_id, H5I_INVALID_HID, "H5Ropen_region ref"); /* Test parameters to H5Ropen_attr */ - ret_id = H5Ropen_attr(NULL, H5P_DEFAULT, aapl_id); + H5E_BEGIN_TRY + { + ret_id = H5Ropen_attr(NULL, H5P_DEFAULT, aapl_id); + } + H5E_END_TRY; VERIFY(ret_id, H5I_INVALID_HID, "H5Ropen_attr ref"); /* Test parameters to H5Rget_obj_type3 */ - ret = H5Rget_obj_type3(NULL, H5P_DEFAULT, NULL); + H5E_BEGIN_TRY + { + ret = H5Rget_obj_type3(NULL, H5P_DEFAULT, NULL); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Rget_obj_type3 ref"); /* Test parameters to H5Rget_file_name */ - name_size = H5Rget_file_name(NULL, NULL, 0); + H5E_BEGIN_TRY + { + name_size = H5Rget_file_name(NULL, NULL, 0); + } + H5E_END_TRY; VERIFY(name_size, (-1), "H5Rget_file_name ref"); /* Test parameters to H5Rget_obj_name */ - name_size = H5Rget_obj_name(NULL, H5P_DEFAULT, NULL, 0); + H5E_BEGIN_TRY + { + name_size = H5Rget_obj_name(NULL, H5P_DEFAULT, NULL, 0); + } + H5E_END_TRY; VERIFY(name_size, (-1), "H5Rget_obj_name ref"); /* Test parameters to H5Rget_attr_name */ - name_size = H5Rget_attr_name(NULL, NULL, 0); + H5E_BEGIN_TRY + { + name_size = H5Rget_attr_name(NULL, NULL, 0); + } + H5E_END_TRY; VERIFY(name_size, (-1), "H5Rget_attr_name ref"); /* Close disk dataspace */ @@ -1920,6 +2024,8 @@ test_reference_obj_deleted(void) H5O_type_t obj_type; /* Object type */ herr_t ret; /* Generic return value */ + MESSAGE(5, ("Testing References to Deleted Objects\n")); + /* Create file */ fid1 = H5Fcreate(FILE_REF_OBJ_DEL, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(fid1, H5I_INVALID_HID, "H5Fcreate"); @@ -3505,23 +3611,25 @@ test_reference(void) * Programmer: Quincey Koziol * September 8, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_reference(void) { - HDremove(FILE_REF_PARAM); - HDremove(FILE_REF_OBJ); - HDremove(FILE_REF_VL_OBJ); - HDremove(FILE_REF_CMPND_OBJ); - HDremove(FILE_REF_REG); - HDremove(FILE_REF_REG_1D); - HDremove(FILE_REF_OBJ_DEL); - HDremove(FILE_REF_GRP); - HDremove(FILE_REF_ATTR); - HDremove(FILE_REF_EXT1); - HDremove(FILE_REF_EXT2); - HDremove(FILE_REF_COMPAT); + H5E_BEGIN_TRY + { + H5Fdelete(FILE_REF_PARAM, H5P_DEFAULT); + H5Fdelete(FILE_REF_OBJ, H5P_DEFAULT); + H5Fdelete(FILE_REF_VL_OBJ, H5P_DEFAULT); + H5Fdelete(FILE_REF_CMPND_OBJ, H5P_DEFAULT); + H5Fdelete(FILE_REF_REG, H5P_DEFAULT); + H5Fdelete(FILE_REF_REG_1D, H5P_DEFAULT); + H5Fdelete(FILE_REF_OBJ_DEL, H5P_DEFAULT); + H5Fdelete(FILE_REF_GRP, H5P_DEFAULT); + H5Fdelete(FILE_REF_ATTR, H5P_DEFAULT); + H5Fdelete(FILE_REF_EXT1, H5P_DEFAULT); + H5Fdelete(FILE_REF_EXT2, H5P_DEFAULT); + H5Fdelete(FILE_REF_COMPAT, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c index 75d441d..8d75fed 100644 --- a/test/trefer_deprec.c +++ b/test/trefer_deprec.c @@ -1853,8 +1853,6 @@ test_reference_deprec(void) * Programmer: Quincey Koziol * September 8, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ void diff --git a/test/tselect.c b/test/tselect.c index 6b63d2b..3dd739c 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -1025,7 +1025,11 @@ test_select_all_hyper(hid_t xfer_plist) CHECK(ret, FAIL, "H5Sselect_none"); /* Read selection from disk (should fail with no selection defined) */ - ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, rbuf); + H5E_BEGIN_TRY + { + ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, rbuf); + } + H5E_END_TRY; VERIFY(ret, FAIL, "H5Dread"); /* Select entire 15x26 extent for disk dataset */ @@ -5605,31 +5609,63 @@ test_select_hyper_valid_combination(void) /* Test all the selections created */ /* Test the invalid combinations between point and hyperslab */ - tmp_sid = H5Scombine_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid); + H5E_BEGIN_TRY + { + tmp_sid = H5Scombine_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid); + } + H5E_END_TRY; VERIFY(tmp_sid, FAIL, "H5Scombine_select"); - tmp_sid = H5Smodify_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid); + H5E_BEGIN_TRY + { + tmp_sid = H5Smodify_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid); + } + H5E_END_TRY; VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test the invalid combination between two hyperslab but of different dimension size */ - tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid); + H5E_BEGIN_TRY + { + tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid); + } + H5E_END_TRY; VERIFY(tmp_sid, FAIL, "H5Scombine_select"); - tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid); + H5E_BEGIN_TRY + { + tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid); + } + H5E_END_TRY; VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test invalid operation inputs to the two functions */ - tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid); + H5E_BEGIN_TRY + { + tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid); + } + H5E_END_TRY; VERIFY(tmp_sid, FAIL, "H5Scombine_select"); - tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid); + H5E_BEGIN_TRY + { + tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid); + } + H5E_END_TRY; VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Test inputs in case of non-existent space ids */ - tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid); + H5E_BEGIN_TRY + { + tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid); + } + H5E_END_TRY; VERIFY(tmp_sid, FAIL, "H5Scombine_select"); - tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid); + H5E_BEGIN_TRY + { + tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid); + } + H5E_END_TRY; VERIFY(tmp_sid, FAIL, "H5Smodify_select"); /* Close dataspaces */ @@ -6891,10 +6927,18 @@ test_select_valid(void) MESSAGE(8, ("Case 1 : sub_space is not a valid dataspace\n")); dims[0] = dims[1] = H5S_UNLIMITED; - sub_space = H5Screate_simple(2, dims, NULL); + H5E_BEGIN_TRY + { + sub_space = H5Screate_simple(2, dims, NULL); + } + H5E_END_TRY; VERIFY(sub_space, FAIL, "H5Screate_simple"); - valid = H5Sselect_valid(sub_space); + H5E_BEGIN_TRY + { + valid = H5Sselect_valid(sub_space); + } + H5E_END_TRY; VERIFY(valid, FAIL, "H5Sselect_valid"); /* Set arrays and dataspace for the rest of the cases */ @@ -6911,7 +6955,11 @@ test_select_valid(void) error = H5Sclose(sub_space); CHECK(error, FAIL, "H5Sclose"); - valid = H5Sselect_valid(sub_space); + H5E_BEGIN_TRY + { + valid = H5Sselect_valid(sub_space); + } + H5E_END_TRY; VERIFY(valid, FAIL, "H5Sselect_valid"); MESSAGE(8, ("Case 3 : in the dimensions\nTry offset (4,4) and size(6,6), the original space is of size " @@ -13867,7 +13915,7 @@ test_select_bounds(void) ret = H5Sget_select_bounds(sid, low_bounds, high_bounds); } H5E_END_TRY; - VERIFY(ret, FAIL, "H5Sget_select_bo unds"); + VERIFY(ret, FAIL, "H5Sget_select_bounds"); /* Set point selection */ coord[0][0] = 3; @@ -14650,7 +14698,11 @@ test_hyper_unlim(void) VERIFY(ssize_out, (hssize_t)H5S_UNLIMITED, "H5Sget_select_npoints"); /* Test H5Sget_select_hyper_nblocks() */ - ssize_out = H5Sget_select_hyper_nblocks(sid); + H5E_BEGIN_TRY + { + ssize_out = H5Sget_select_hyper_nblocks(sid); + } + H5E_END_TRY; VERIFY(ssize_out, (hssize_t)H5S_UNLIMITED, "H5Sget_select_hyper_nblocks"); /* Test H5Sget_select_bounds() */ @@ -16211,5 +16263,9 @@ test_select(void) void cleanup_select(void) { - HDremove(FILENAME); + H5E_BEGIN_TRY + { + H5Fdelete(FILENAME, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/tsohm.c b/test/tsohm.c index d923efb..7d9964f 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -480,8 +480,6 @@ error: * Programmer: James Laird * Saturday, August 26, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static hid_t @@ -555,8 +553,6 @@ error: * Programmer: James Laird * Wednesday, October 4, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static hid_t @@ -1521,8 +1517,6 @@ size2_verify_plist2(hid_t plist) * Programmer: James Laird * Friday, January 26, 2007 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -1565,8 +1559,6 @@ size2_dump_struct(const char *name, size2_helper_struct *sizes) * Programmer: James Laird * Friday, November 17, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2724,8 +2716,6 @@ test_sohm_size2(int close_reopen) * Programmer: James Laird * Tuesday, December 19, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -2763,8 +2753,6 @@ delete_helper_write(hid_t file_id, hid_t *dspace_id, hid_t *dcpl_id, int x) * Programmer: James Laird * Tuesday, December 19, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -2812,8 +2800,6 @@ delete_helper_read(hid_t file_id, hid_t *dspace_id, int x) * Programmer: James Laird * Tuesday, December 19, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -2896,8 +2882,6 @@ delete_helper(hid_t fcpl_id, hid_t *dspace_id, hid_t *dcpl_id) * Programmer: James Laird * Tuesday, December 19, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -3036,8 +3020,6 @@ test_sohm_delete(void) * Programmer: James Laird * Wednesday, January 3, 2007 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3137,8 +3119,6 @@ verify_dset_create_and_delete_does_not_grow_file(hid_t fcpl_id) * Programmer: James Laird * Wednesday, January 3, 2007 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -3217,8 +3197,6 @@ test_sohm_delete_revert(void) * Programmer: James Laird * Friday, December 22, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -3285,8 +3263,6 @@ verify_dset_create_and_open_through_extlink_with_sohm(hid_t src_fcpl_id, hid_t d * Programmer: James Laird * Friday, December 22, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -3333,8 +3309,6 @@ test_sohm_extlink(void) * Programmer: James Laird * Wednesday, January 10, 2007 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -3600,8 +3574,6 @@ verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen) * Programmer: James Laird * Wednesday, January 10, 2007 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -3682,8 +3654,6 @@ test_sohm_extend_dset(void) * Programmer: Raymond Lu * 13 October, 2008 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -3875,8 +3845,6 @@ test_sohm(void) * Programmer: James Laird * October 9, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ void diff --git a/test/ttime.c b/test/ttime.c index 99f38bc..81c5015 100644 --- a/test/ttime.c +++ b/test/ttime.c @@ -220,12 +220,14 @@ test_time(void) * Programmer: Quincey Koziol * October 19, 2000 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_time(void) { - HDremove(DATAFILE); + H5E_BEGIN_TRY + { + H5Fdelete(DATAFILE, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/tunicode.c b/test/tunicode.c index bf5f64f..27df42d 100644 --- a/test/tunicode.c +++ b/test/tunicode.c @@ -859,5 +859,9 @@ test_unicode(void) void cleanup_unicode(void) { - HDremove(FILENAME); + H5E_BEGIN_TRY + { + H5Fdelete(FILENAME, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/tvlstr.c b/test/tvlstr.c index c9204a5..3fcc57d 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -880,6 +880,8 @@ test_write_same_element(void) hsize_t coord[SPACE1_RANK][NUMP]; herr_t ret; + MESSAGE(5, ("Testing writing to same element of VL string dataset twice\n")); + file1 = H5Fcreate(DATAFILE3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(file1, FAIL, "H5Fcreate"); @@ -993,14 +995,16 @@ test_vlstrings(void) * Programmer: Quincey Koziol * September 10, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_vlstrings(void) { - HDremove(DATAFILE); - HDremove(DATAFILE2); - HDremove(DATAFILE3); + H5E_BEGIN_TRY + { + H5Fdelete(DATAFILE, H5P_DEFAULT); + H5Fdelete(DATAFILE2, H5P_DEFAULT); + H5Fdelete(DATAFILE3, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/tvltypes.c b/test/tvltypes.c index c791350..1e0de1c 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -3254,12 +3254,14 @@ test_vltypes(void) * Programmer: Quincey Koziol * June 8, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ void cleanup_vltypes(void) { - HDremove(FILENAME); + H5E_BEGIN_TRY + { + H5Fdelete(FILENAME, H5P_DEFAULT); + } + H5E_END_TRY; } diff --git a/test/twriteorder.c b/test/twriteorder.c index c7984e7..165abcf 100644 --- a/test/twriteorder.c +++ b/test/twriteorder.c @@ -273,9 +273,6 @@ write_wo_file(void) HDmemset(&buffer[4], i & 0xff, (size_t)(BLOCKSIZE_DFT - 4)); /* write the block */ -#ifdef DEBUG - HDprintf("writing block at %d\n", blkaddr); -#endif HDlseek(write_fd_g, (HDoff_t)blkaddr, SEEK_SET); if ((bytes_wrote = HDwrite(write_fd_g, buffer, (size_t)blocksize_g)) != blocksize_g) { HDprintf("blkaddr write failed in partition %d\n", i); @@ -295,9 +292,6 @@ write_wo_file(void) } /* all writes done. return success. */ -#ifdef DEBUG - HDprintf("wrote %d blocks\n", nlinkedblock_g); -#endif return 0; } @@ -305,9 +299,8 @@ int read_wo_file(void) { int read_fd; - int blkaddr = 0; - h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */ - int linkedblocks_read = 0; + int blkaddr = 0; + h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */ char buffer[BLOCKSIZE_DFT]; /* Open the data file */ @@ -324,30 +317,19 @@ read_wo_file(void) return -1; } } - linkedblocks_read++; /* got a non-zero blkaddr. Proceed down the linked blocks. */ -#ifdef DEBUG - HDprintf("got initial block address=%d\n", blkaddr); -#endif while (blkaddr != 0) { HDlseek(read_fd, (HDoff_t)blkaddr, SEEK_SET); if ((bytes_read = HDread(read_fd, buffer, (size_t)blocksize_g)) != blocksize_g) { HDprintf("blkaddr read failed in partition %d\n", 0); return -1; } - linkedblocks_read++; /* retrieve the block address in byte 0-3 */ HDmemcpy(&blkaddr, &buffer[0], sizeof(blkaddr)); -#ifdef DEBUG - HDprintf("got next block address=%d\n", blkaddr); -#endif } -#ifdef DEBUG - HDprintf("read %d blocks\n", linkedblocks_read); -#endif return 0; } @@ -426,9 +408,6 @@ main(int argc, char *argv[]) /* launch writer */ /* ============= */ /* this process continues to launch the writer */ -#ifdef DEBUG - HDprintf("%d: continue as the writer process\n", mypid); -#endif if (write_wo_file() < 0) { HDfprintf(stderr, "write_wo_file encountered error\n"); Hgoto_error(1); diff --git a/test/unlink.c b/test/unlink.c index e2cf67f..e18ae73 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -78,8 +78,6 @@ const char *FILENAME[] = {"unlink", "new_move_a", "new_move_b", * Programmer: Robb Matzke * Friday, September 25, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -155,8 +153,6 @@ error: * Programmer: Robb Matzke * Friday, September 25, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -309,8 +305,6 @@ error: * Programmer: Robb Matzke * Friday, September 25, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -375,8 +369,6 @@ error: * Programmer: Raymond Lu * Thursday, April 25, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -478,8 +470,6 @@ error: * Programmer: Raymond Lu * Thursday, April 25, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -540,8 +530,6 @@ error: * Programmer: Quincey Koziol * Saturday, March 22, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1480,8 +1468,6 @@ error: * Programmer: Quincey Koziol * Friday, April 11, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1546,8 +1532,6 @@ error: * Programmer: Quincey Koziol * Saturday, August 16, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1627,8 +1611,6 @@ error: * Programmer: Quincey Koziol * Saturday, August 16, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1740,8 +1722,6 @@ delete_node(hid_t pid, hid_t id) * Programmer: Quincey Koziol * Monday, January 19, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1829,8 +1809,6 @@ error: * Programmer: Quincey Koziol * Monday, January 19, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -1921,8 +1899,6 @@ error: * Programmer: Quincey Koziol * Monday, January 19, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2299,8 +2275,6 @@ error: * Programmer: Quincey Koziol * Wednesday, July 14, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2384,8 +2358,6 @@ error: * Programmer: James Laird * Wednesday, July 28, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2466,8 +2438,6 @@ error: * Programmer: James Laird * Wednesday, July 28, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -2545,8 +2515,6 @@ error: * Programmer: Quincey Koziol * Monday, September 27, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -4043,10 +4043,6 @@ error: * Programmer: John Mainzer * 6/21/20 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -4149,10 +4145,6 @@ test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], siz * Programmer: John Mainzer * 3/10/21 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -4286,10 +4278,6 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a * Programmer: John Mainzer * 6/21/20 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -4341,10 +4329,6 @@ test_vector_io__read_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], had * Programmer: John Mainzer * 6/21/20 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ @@ -4394,8 +4378,6 @@ test_vector_io__write_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], ha * Programmer: John Mainzer * 6/21/20 * - * Changes: None. - * *------------------------------------------------------------------------- */ @@ -4465,8 +4447,6 @@ test_vector_io__verify_v(uint32_t count, H5FD_mem_t types[], size_t sizes[], con * Programmer: John Mainzer * 6/21/20 * - * Changes: None. - * *------------------------------------------------------------------------- */ @@ -4541,8 +4521,6 @@ test_vector_io__dump_test_vectors(uint32_t count, H5FD_mem_t types[], haddr_t ad * Programmer: John Mainzer * 6/20/20 * - * Changes: None. - * *------------------------------------------------------------------------- */ #define VECTOR_LEN 16 @@ -4983,8 +4961,6 @@ error: * Programmer: Neil Fortner * 7/1/21 * - * Changes: None. - * *------------------------------------------------------------------------- */ /* Array dimensions, used for all selection I/O tests. Currently both must be @@ -5030,8 +5006,6 @@ error: * Programmer: Neil Fortner * 7/1/21 * - * Changes: None. - * *------------------------------------------------------------------------- */ static herr_t @@ -5106,8 +5080,6 @@ error: * Programmer: Neil Fortner * 7/1/21 * - * Changes: None. - * *------------------------------------------------------------------------- */ static herr_t @@ -28,7 +28,7 @@ #include "H5VLpkg.h" /* Virtual Object Layer */ /* Filename */ -const char *FILENAME[] = {"native_vol_test", NULL}; +const char *FILENAME[] = {"vol_test_file", NULL}; #define NATIVE_VOL_TEST_GROUP_NAME "test_group" #define NATIVE_VOL_TEST_DATASET_NAME "test_dataset" @@ -174,6 +174,9 @@ static const H5VL_class_t reg_opt_vol_g = { }; static herr_t fake_get_cap_flags(const void *info, uint64_t *cap_flags); +static herr_t fake_vol_info_to_str(const void *info, char **str); +static herr_t fake_vol_str_to_info(const char *str, void **info); +static herr_t fake_vol_free_info(void *info); #define FAKE_VOL_NAME "fake" #define FAKE_VOL_VALUE ((H5VL_class_value_t)501) @@ -193,12 +196,12 @@ static const H5VL_class_t fake_vol_g = { NULL, /* terminate */ { /* info_cls */ - (size_t)0, /* size */ - NULL, /* copy */ - NULL, /* compare */ - NULL, /* free */ - NULL, /* to_str */ - NULL, /* from_str */ + (size_t)0, /* size */ + NULL, /* copy */ + NULL, /* compare */ + fake_vol_free_info, /* free */ + fake_vol_info_to_str, /* to_str */ + fake_vol_str_to_info, /* from_str */ }, { /* wrap_cls */ @@ -559,6 +562,77 @@ reg_opt_datatype_get(void H5_ATTR_UNUSED *obj, H5VL_datatype_get_args_t *args, h } /* end reg_opt_datatype_get() */ /*------------------------------------------------------------------------- + * Function: fake_vol_info_to_str + * + * Purpose: Convert the fake VOL info to a string + * + * Return: SUCCEED/FAIL + * + *------------------------------------------------------------------------- + */ +static herr_t +fake_vol_info_to_str(const void *info, char **str) +{ + herr_t ret_value = SUCCEED; /* Return value */ + const int val = *(const int *)info; + const int str_size = 16; /* The size of the string */ + + /* Verify the info is correct before continuing */ + if (val != INT_MAX) { + HDprintf("The value of info (%d) is incorrect\n", val); + return FAIL; + } + + /* Allocate the string long enough for the info */ + *str = (char *)malloc(str_size); + + HDsnprintf(*str, str_size, "%d", *((const int *)info)); + + return ret_value; +} /* end fake_vol_info_to_str() */ + +/*------------------------------------------------------------------------- + * Function: fake_vol_str_to_info + * + * Purpose: Convert a string to a VOL info + * + * Return: SUCCEED/FAIL + * + *------------------------------------------------------------------------- + */ +static herr_t +fake_vol_str_to_info(const char *str, void **info /*out*/) +{ + herr_t ret_value = SUCCEED; /* Return value */ + + *((int **)info) = (int *)malloc(sizeof(int)); + + **((int **)info) = atoi(str); + + return ret_value; +} /* end fake_vol_str_to_info() */ + +/*------------------------------------------------------------------------- + * Function: fake_vol_free_info + * + * Purpose: Free the memory of a VOL info + * + * Return: SUCCEED/FAIL + * + *------------------------------------------------------------------------- + */ +static herr_t +fake_vol_free_info(void *info) +{ + herr_t ret_value = SUCCEED; /* Return value */ + + if (info) + HDfree(info); + + return ret_value; +} /* end fake_vol_free_info() */ + +/*------------------------------------------------------------------------- * Function: fake_get_cap_flags * * Purpose: Return the capability flags for the 'fake' connector @@ -1664,7 +1738,7 @@ exercise_reg_opt_oper(hid_t fake_vol_id, hid_t reg_opt_vol_id, H5VL_subclass_t s /* Verify that the reserved amount of optional operations is obeyed */ /* (The first optional operation registered should be at the lower limit) */ - if (op_val != H5VL_RESERVED_NATIVE_OPTIONAL) + if (op_val < H5VL_RESERVED_NATIVE_OPTIONAL) TEST_ERROR; /* Look up 1st registered optional operation */ @@ -1683,7 +1757,7 @@ exercise_reg_opt_oper(hid_t fake_vol_id, hid_t reg_opt_vol_id, H5VL_subclass_t s /* Verify that the reserved amount of optional operations is obeyed */ /* (The 2nd optional operation registered should be at the lower limit + 1) */ - if (op_val2 != (H5VL_RESERVED_NATIVE_OPTIONAL + 1)) + if (op_val2 < (H5VL_RESERVED_NATIVE_OPTIONAL + 1)) TEST_ERROR; /* Look up 2nd registered optional operation */ @@ -2242,10 +2316,9 @@ test_get_vol_name(void) conn_env_str = "native"; /* Skip the connectors other than the native and pass_through connector */ - if (HDstrcmp(conn_env_str, "native") && - HDstrncmp(conn_env_str, "pass_through", HDstrlen("pass_through"))) { + if (HDstrcmp(conn_env_str, "native") && HDstrcmp(conn_env_str, "pass_through")) { SKIPPED(); - HDprintf(" only test the native or pass_through connector\n"); + HDprintf(" only test the native or internal pass_through connector\n"); return SUCCEED; } @@ -2262,8 +2335,7 @@ test_get_vol_name(void) /* When comparing the pass_through connector, ignore the rest information (under_vol=0;under_info={}) */ if ((!HDstrcmp(conn_env_str, "native") && HDstrcmp(vol_name, "native")) || - (!HDstrncmp(conn_env_str, "pass_through", HDstrlen("pass_through")) && - HDstrcmp(vol_name, "pass_through"))) + (!HDstrcmp(conn_env_str, "pass_through") && HDstrcmp(vol_name, "pass_through"))) TEST_ERROR; if (H5Fclose(file_id) < 0) @@ -2287,7 +2359,7 @@ error: H5E_END_TRY; return FAIL; -} /* end test_vol_cap_flags() */ +} /* end test_get_vol_name() */ /*------------------------------------------------------------------------- * Function: test_wrap_register() @@ -2365,6 +2437,156 @@ error: } /* end test_wrap_register() */ /*------------------------------------------------------------------------- + * Function: test_info_to_str() + * + * Purpose: Tests the conversion between a VOL info and a string + * + * Return: SUCCEED/FAIL + * + *------------------------------------------------------------------------- + */ +static herr_t +test_info_to_str(void) +{ + hid_t fapl_id = H5I_INVALID_HID; + hid_t vol_id = H5I_INVALID_HID; + int info = INT_MAX; + char *ret_str = NULL; + int *ret_info = NULL; + + TESTING("conversion between a VOL info and a string"); + + /* Register a fake VOL */ + if ((vol_id = H5VLregister_connector(&fake_vol_g, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) + TEST_ERROR; + + if (H5Pset_vol(fapl_id, vol_id, NULL) < 0) + TEST_ERROR; + + /* Serialize the VOL info into a string */ + if (H5VLconnector_info_to_str(&info, vol_id, &ret_str) < 0) + TEST_ERROR; + + /* Parse the string and construct it into a VOL info */ + if (H5VLconnector_str_to_info(ret_str, vol_id, (void **)(&ret_info)) < 0) + TEST_ERROR; + + if (*ret_info != info) + FAIL_PUTS_ERROR("the returned VOL info doesn't match the original info"); + + /* Free the VOL info being returned */ + if (H5VLfree_connector_info(vol_id, ret_info) < 0) + TEST_ERROR; + + /* Free the string being returned */ + if (ret_str) + HDfree(ret_str); + + if (H5Pclose(fapl_id) < 0) + TEST_ERROR; + + /* Unregister the fake VOL ID */ + if (H5VLunregister_connector(vol_id) < 0) + TEST_ERROR; + + PASSED(); + + return SUCCEED; + +error: + H5E_BEGIN_TRY + { + H5VLunregister_connector(vol_id); + H5Pclose(fapl_id); + } + H5E_END_TRY; + + return FAIL; +} /* end test_info_to_str() */ + +/*------------------------------------------------------------------------- + * Function: test_query_optional + * + * Purpose: Tests the bug fix (HDFFV-11208) that a committed datatype + * triggered an assertion failure in H5VLquery_optional + * + * Return: SUCCEED/FAIL + * + *------------------------------------------------------------------------- + */ +static herr_t +test_query_optional(void) +{ + hid_t fapl_id = H5I_INVALID_HID; + hid_t file_id = H5I_INVALID_HID; + hid_t group_id = H5I_INVALID_HID; + hid_t dtype_id = H5I_INVALID_HID; + char filename[NAME_LEN]; + uint64_t supported = 0; + + TESTING("H5VLquery_optional"); + + /* Retrieve the file access property for testing */ + fapl_id = h5_fileaccess(); + + h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename); + + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) + TEST_ERROR; + + if ((group_id = H5Gcreate2(file_id, "test_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Test H5VLquery_optional with a group */ + if (H5VLquery_optional(group_id, H5VL_SUBCLS_OBJECT, H5VL_NATIVE_OBJECT_GET_COMMENT, &supported) < 0) + TEST_ERROR; + + if ((dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + + /* Commit the datatype into the file */ + if (H5Tcommit2(file_id, "test_dtype", dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* Test H5VLquery_optional with a committed datatype where the assertion failure happened in the past */ + if (H5VLquery_optional(dtype_id, H5VL_SUBCLS_OBJECT, H5VL_NATIVE_OBJECT_GET_COMMENT, &supported) < 0) + TEST_ERROR; + + if (H5Gclose(group_id) < 0) + TEST_ERROR; + + if (H5Tclose(dtype_id) < 0) + TEST_ERROR; + + if (H5Fclose(file_id) < 0) + TEST_ERROR; + + h5_delete_test_file(FILENAME[0], fapl_id); + + if (H5Pclose(fapl_id) < 0) + TEST_ERROR; + + PASSED(); + + return SUCCEED; + +error: + H5E_BEGIN_TRY + { + H5Gclose(group_id); + H5Tclose(dtype_id); + H5Fclose(file_id); + H5Pclose(fapl_id); + } + H5E_END_TRY; + + return FAIL; +} /* end test_query_optional() */ + +/*------------------------------------------------------------------------- * Function: main * * Purpose: Tests the virtual object layer interface (H5VL) @@ -2402,6 +2624,8 @@ main(void) nerrors += test_vol_cap_flags() < 0 ? 1 : 0; nerrors += test_get_vol_name() < 0 ? 1 : 0; nerrors += test_wrap_register() < 0 ? 1 : 0; + nerrors += test_info_to_str() < 0 ? 1 : 0; + nerrors += test_query_optional() < 0 ? 1 : 0; if (nerrors) { HDprintf("***** %d Virtual Object Layer TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); |