diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-05 16:06:35 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-05 16:06:35 (GMT) |
| commit | 70495751c05c4471be3a55b0e933e4d1e73d79c5 (patch) | |
| tree | 5d9c6091762cbca3177906bbfddc9cb9ad7509d8 | |
| parent | 57f5d00a43421e4d2847d55560e4015f28cf162f (diff) | |
| parent | 5d1590079ea0061a7b86d7210cb796b6d58a17c7 (diff) | |
| download | hdf5-70495751c05c4471be3a55b0e933e4d1e73d79c5.zip hdf5-70495751c05c4471be3a55b0e933e4d1e73d79c5.tar.gz hdf5-70495751c05c4471be3a55b0e933e4d1e73d79c5.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '5d1590079ea0061a7b86d7210cb796b6d58a17c7':
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.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 |