diff options
Diffstat (limited to 'test/links.c')
-rw-r--r-- | test/links.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/test/links.c b/test/links.c index b87b998..dbfd1ef 100644 --- a/test/links.c +++ b/test/links.c @@ -9896,11 +9896,12 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format) /* Family file driver cannot be used with family or multi drivers for member files */ /* Also disable parallel member drivers, because H5F_HAS_FEATURE(H5FD_FEAT_HAS_MPI) would report FALSE, causing problems */ - base_driver = H5Pget_driver(fapl); - op_data.base_fapl = (base_driver == H5FD_FAMILY || base_driver == H5FD_MULTI || - base_driver == H5FD_MPIO || base_driver == H5FD_CORE || base_driver == H5FD_DIRECT) - ? H5P_DEFAULT - : fapl; + base_driver = H5Pget_driver(fapl); + op_data.base_fapl = + (base_driver == H5FD_FAMILY || base_driver == H5FD_MULTI || base_driver == H5FD_MPIO || + base_driver == H5FD_CORE || base_driver == H5FD_DIRECT || base_driver == H5FD_SUBFILING) + ? H5P_DEFAULT + : fapl; op_data.fam_size = ELINK_CB_FAM_SIZE; op_data.code = 0; @@ -22554,7 +22555,7 @@ main(void) unsigned minimize_dset_oh; unsigned efc; /* Whether to use the external file cache */ const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t driver_uses_modified_filename = h5_driver_uses_modified_filename(); + hbool_t driver_is_default_compatible; env_h5_drvr = HDgetenv(HDF5_DRIVER); if (env_h5_drvr == NULL) @@ -22563,6 +22564,9 @@ main(void) h5_reset(); fapl = h5_fileaccess(); + if (h5_driver_is_default_vfd_compatible(fapl, &driver_is_default_compatible) < 0) + TEST_ERROR; + /* fapl2 uses "latest version bounds" */ if ((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR; @@ -22676,7 +22680,7 @@ main(void) nerrors += external_link_closing_deprec(my_fapl, new_format) < 0 ? 1 : 0; #endif /* H5_NO_DEPRECATED_SYMBOLS */ - if (!driver_uses_modified_filename) { + if (driver_is_default_compatible) { nerrors += external_link_endian(new_format) < 0 ? 1 : 0; } @@ -22691,7 +22695,7 @@ main(void) nerrors += external_link_reltar(my_fapl, new_format) < 0 ? 1 : 0; nerrors += external_link_chdir(my_fapl, new_format) < 0 ? 1 : 0; - if (!driver_uses_modified_filename) { + if (driver_is_default_compatible) { nerrors += external_set_elink_fapl1(my_fapl, new_format) < 0 ? 1 : 0; } |