mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-17 16:10:24 +08:00
Play nice with existing plugin paths (#2394)
* 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. * Play nice with existing plugin paths 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:
parent
337a882af8
commit
54590f3ebd
@ -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
|
||||
|
@ -82,7 +82,7 @@ if [ $? != 0 ]; then
|
||||
fi
|
||||
|
||||
# setup plugin path
|
||||
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
|
||||
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}"
|
||||
|
||||
#
|
||||
# copy test files and expected output files from source dirs to test dir
|
||||
|
@ -88,7 +88,7 @@ if [ $? != 0 ]; then
|
||||
fi
|
||||
|
||||
# setup plugin path
|
||||
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
|
||||
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}"
|
||||
|
||||
#
|
||||
# copy test files and expected output files from source dirs to test dir
|
||||
|
@ -88,7 +88,7 @@ if [ $? != 0 ]; then
|
||||
fi
|
||||
|
||||
# setup plugin path
|
||||
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
|
||||
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}"
|
||||
|
||||
#
|
||||
# copy test files and expected output files from source dirs to test dir
|
||||
|
@ -98,7 +98,7 @@ if [ $? != 0 ]; then
|
||||
fi
|
||||
|
||||
# setup plugin path
|
||||
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
|
||||
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}"
|
||||
|
||||
COPY_TESTFILES_TO_TESTDIR()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user