diff options
Diffstat (limited to 'test/API/H5_api_group_test.c')
| -rw-r--r-- | test/API/H5_api_group_test.c | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/test/API/H5_api_group_test.c b/test/API/H5_api_group_test.c index f652202..016d988 100644 --- a/test/API/H5_api_group_test.c +++ b/test/API/H5_api_group_test.c @@ -1123,7 +1123,7 @@ test_group_property_lists(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" API functions for basic file, group, property list, creation order aren't supported " + HDprintf(" API functions for basic file, group, property list, or creation order aren't supported " "with this connector\n"); return 0; } @@ -1393,10 +1393,9 @@ test_get_group_info(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || - !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { + !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file or group, creation order aren't supported with this " - "connector\n"); + HDprintf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } @@ -1420,10 +1419,12 @@ test_get_group_info(void) goto error; } - if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); - goto error; + if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { + if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { + H5_FAILED(); + HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + goto error; + } } if ((parent_group_id = H5Gcreate2(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, @@ -1562,6 +1563,12 @@ test_get_group_info(void) { TESTING_2("H5Gget_info_by_idx by creation order in increasing order"); + if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { + SKIPPED(); + HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + PART_EMPTY(H5Gget_info_by_idx_crt_order_increasing); + } + for (i = 0; i < GROUP_GET_INFO_TEST_GROUP_NUMB; i++) { memset(&group_info, 0, sizeof(group_info)); @@ -1613,6 +1620,12 @@ test_get_group_info(void) { TESTING_2("H5Gget_info_by_idx by creation order in decreasing order"); + if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { + SKIPPED(); + HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + PART_EMPTY(H5Gget_info_by_idx_crt_order_decreasing); + } + for (i = 0; i < GROUP_GET_INFO_TEST_GROUP_NUMB; i++) { memset(&group_info, 0, sizeof(group_info)); @@ -1714,7 +1727,7 @@ test_get_group_info(void) PART_BEGIN(H5Gget_info_by_idx_name_order_decreasing) { TESTING_2("H5Gget_info_by_idx by alphabetical order in decreasing order"); -#ifndef NO_DECREASING_ALPHA_ITER_ORDER + for (i = 0; i < GROUP_GET_INFO_TEST_GROUP_NUMB; i++) { memset(&group_info, 0, sizeof(group_info)); @@ -1728,14 +1741,15 @@ test_get_group_info(void) if (group_info.nlinks != 0) { H5_FAILED(); - HDprintf(" group's number of links '%lld' doesn't match expected value '%lld'\n", + HDprintf(" group's number of links '%" PRIuHSIZE + "' doesn't match expected value '%d'\n", group_info.nlinks, 0); PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } if (group_info.max_corder != 0) { H5_FAILED(); - HDprintf(" group's max creation order '%lld' doesn't match expected value '%lld'\n", + HDprintf(" group's max creation order '%lld' doesn't match expected value '%d'\n", (long long)group_info.max_corder, 0); PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } @@ -1759,10 +1773,6 @@ test_get_group_info(void) } PASSED(); -#else - SKIPPED(); - PART_EMPTY(H5Gget_info_by_idx_name_order_decreasing); -#endif } PART_END(H5Gget_info_by_idx_name_order_decreasing); } @@ -1811,10 +1821,9 @@ test_get_group_info_invalid_params(void) TESTING_MULTIPART("retrieval of group info with invalid parameters"); /* Make sure the connector supports the API functions being tested */ - if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || - !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { + if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, more group, creation order aren't supported with this " + HDprintf(" API functions for basic file, or more group aren't supported with this " "connector\n"); return 0; } @@ -2172,7 +2181,7 @@ test_flush_group(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for basic file, more group, creation order aren't supported with this " + HDprintf(" API functions for basic file, group, or flush refresh aren't supported with this " "connector\n"); return 0; } @@ -2280,8 +2289,8 @@ test_refresh_group(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or refresh aren't supported with this connector\n"); + HDprintf(" API functions for basic file, group, or flush refresh aren't supported with this " + "connector\n"); return 0; } |