summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Henderson <jhenderson@hdfgroup.org>2020-04-03 20:06:08 (GMT)
committerJordan Henderson <jhenderson@hdfgroup.org>2020-04-03 20:06:08 (GMT)
commit5d1590079ea0061a7b86d7210cb796b6d58a17c7 (patch)
treec11bd918270f05b87fd9f8d55d749725b9271046
parent96ea55b95d2d55cd3409d2caa0bbec80e51d860b (diff)
parenta5a2fb44296327787476407a249d9470b3c80427 (diff)
downloadhdf5-5d1590079ea0061a7b86d7210cb796b6d58a17c7.zip
hdf5-5d1590079ea0061a7b86d7210cb796b6d58a17c7.tar.gz
hdf5-5d1590079ea0061a7b86d7210cb796b6d58a17c7.tar.bz2
Merge pull request #2490 in HDFFV/hdf5 from tools_vol_update to develop
* commit 'a5a2fb44296327787476407a249d9470b3c80427': Skip testing of passthrough VOL connector in a Family File tools test Restore previous tools library driver name behavior with passthrough VOL connector
-rw-r--r--tools/lib/h5tools.c2
-rw-r--r--tools/test/h5repack/h5repack.sh.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 102822d..cd915f5 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -738,7 +738,7 @@ h5tools_get_vfd_name(hid_t fapl_id, char *drivername, size_t drivername_size)
/* TODO: For now, we have no way of determining if an arbitrary
* VOL connector is native-terminal. */
- if (fapl_vol_id == H5VL_NATIVE) {
+ if (fapl_vol_id == H5VL_NATIVE || fapl_vol_id == H5VL_PASSTHRU) {
const char *driver_name;
hid_t driver_id;
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index 6e63136..ad6fef8 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -745,7 +745,7 @@ TOOLTEST1()
TESTING $H5REPACK $@
(
cd $TESTDIR
- $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+ $ENVCMD $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
)
RET=$?
if [ $RET != 0 ] ; then