mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

Browse Source 
* 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
This commit is contained in:
Allen Byrne 2020-04-05 11:06:35 -05:00
commit 70495751c0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lib/h5tools.c
View File

@ -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;

2
tools/test/h5repack/h5repack.sh.in
View File

@ -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