diff options
| author | Quincey Koziol <koziol@koziol.gov> | 2020-04-04 18:49:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@koziol.gov> | 2020-04-04 18:49:42 (GMT) |
| commit | d17c259a4df5fcfd89cba5ddf877b46be8a40ab5 (patch) | |
| tree | 1666363855e2c96f6b29a72d958a6dc1b4bc25e7 | |
| parent | ab89adb58a4781fe6715f17684be282cd9f58fb6 (diff) | |
| parent | 5d1590079ea0061a7b86d7210cb796b6d58a17c7 (diff) | |
| download | hdf5-d17c259a4df5fcfd89cba5ddf877b46be8a40ab5.zip hdf5-d17c259a4df5fcfd89cba5ddf877b46be8a40ab5.tar.gz hdf5-d17c259a4df5fcfd89cba5ddf877b46be8a40ab5.tar.bz2 | |
Merge remote-tracking branch 'origin/develop' into pio_update
| -rw-r--r-- | tools/lib/h5tools.c | 2 | ||||
| -rw-r--r-- | tools/test/h5repack/h5repack.sh.in | 2 |
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 |