From 08e77ac6facaa0e22021d10d32cf8aefa98b7398 Mon Sep 17 00:00:00 2001 From: Jordan Henderson Date: Fri, 3 Apr 2020 12:45:22 -0500 Subject: [PATCH 1/2] Restore previous tools library driver name behavior with passthrough VOL connector --- tools/lib/h5tools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 6f95457aff..5a8162a162 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; From a5a2fb44296327787476407a249d9470b3c80427 Mon Sep 17 00:00:00 2001 From: Jordan Henderson Date: Fri, 3 Apr 2020 14:29:10 -0500 Subject: [PATCH 2/2] Skip testing of passthrough VOL connector in a Family File tools test --- tools/test/h5repack/h5repack.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in index 6e63136fcc..ad6fef8686 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