mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update FORTRAN VOL connector test for external pass-through testing (#2393)

Browse Source 
* Correct concurrency bugs when running tests, along with a bugfix & small
warning cleanup.

* Committing clang-format changes

* Allow spaces (and tabs) in VOL connector info string from environment variable.

* Parse connector name from HDF5_PLUGIN_PATH environment variable better

* Correct H5VLquery_optional to use H5VL routine instead of H5I.  Also add an
error message to the failure return value from not finding a plugin.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AWS ParallelCluster user <ec2-user@ip-10-0-0-65.us-east-2.compute.internal>
Co-authored-by: Koziol <qkoziol@88665a374c70.ant.amazon.com>
This commit is contained in:
Quincey Koziol 2023-01-05 17:42:33 -06:00 committed by GitHub
parent 423ee69c1e
commit 337a882af8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fortran/test/vol_connector.F90
View File

@ -237,6 +237,7 @@ PROGRAM vol_connector
LOGICAL :: cleanup, status
CHARACTER(LEN=12) :: VOL_CONNECTOR_ENV
INTEGER :: LEN = 0
INTEGER :: CONN_NAME_LEN
CALL h5open_f(error)
cleanup = .TRUE.
@ -251,8 +252,9 @@ PROGRAM vol_connector
! Check to see if the VOL connector was set with an env variable
CALL GET_ENVIRONMENT_VARIABLE("HDF5_VOL_CONNECTOR", VOL_CONNECTOR_ENV, LEN)
CONN_NAME_LEN = INDEX(VOL_CONNECTOR_ENV, ' ')
IF(LEN.NE.0)THEN
NATIVE_VOL_CONNECTOR_NAME = TRIM(VOL_CONNECTOR_ENV)
NATIVE_VOL_CONNECTOR_NAME = TRIM(VOL_CONNECTOR_ENV(1:CONN_NAME_LEN))
ELSE
NATIVE_VOL_CONNECTOR_NAME = "native"
ENDIF

2
src/H5PLint.c
View File

@ -259,6 +259,8 @@ H5PL_load(H5PL_type_t type, const H5PL_key_t *key)
/* Set the return value we found the plugin */
if (found)
ret_value = plugin_info;
else
HGOTO_ERROR(H5E_PLUGIN, H5E_NOTFOUND, NULL, "unable to locate plugin")
done:
FUNC_LEAVE_NOAPI(ret_value)

2
src/H5VL.c
View File

@ -967,7 +967,7 @@ H5VLquery_optional(hid_t obj_id, H5VL_subclass_t subcls, int opt_type, uint64_t
/* Check args */
if (NULL == flags)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid 'flags' pointer")
if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(obj_id)))
if (NULL == (vol_obj = H5VL_vol_object(obj_id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier")
/* Query the connector */