philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename tool for checking VOL connector compatibility

Browse Source
This commit is contained in:
Quincey Koziol
2021-07-02 14:47:30 -05:00
parent a32ba3c586
commit fab0187f2f
10 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST
View File

@@ -2973,7 +2973,7 @@
# Utils directory
./utils/Makefile.am
./utils/vds_check_compat_vol.c
./utils/vds_elink_compat_vol.c
# Mirror VFD utilities
./utils/mirror_vfd/Makefile.am

4
test/testvdsswmr.sh.in
View File

@@ -100,8 +100,8 @@ fi
# Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR
# environment variable supports Virtual Datasets.
#
# Note: Depends on vds_check_compat_vol tool from $(topdir)/utils
../utils/vds_check_compat_vol
# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils
../utils/vds_elink_compat_vol
rc=$?
if [ $rc -ne 0 ] ; then
echo

8
tools/test/h5diff/testh5diff.sh.in
View File

@@ -35,8 +35,8 @@ EXIT_FAILURE=1
H5DIFF=../../src/h5diff/h5diff # The tool name
H5DIFF_BIN=`pwd`/$H5DIFF # The path of the tool binary
VDS_CHECK_COMPAT_VOL=../../../utils/vds_check_compat_vol # The vds_check_compat_vol tool name
VDS_CHECK_COMPAT_VOL_BIN=`pwd`/$VDS_CHECK_COMPAT_VOL # The path of the vds_check_compat_vol tool binary
VDS_ELINK_COMPAT_VOL=../../../utils/vds_elink_compat_vol # The vds_elink_compat_vol tool name
VDS_ELINK_COMPAT_VOL_BIN=`pwd`/$VDS_ELINK_COMPAT_VOL # The path of the vds_elink_compat_vol tool binary
RM='rm -rf'
CMP='cmp -s'
@@ -600,8 +600,8 @@ $CP -f $SRC_TOOLS_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5
# Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR
# environment variable supports virtual datasets (and external links)
#
# Note: Depends on vds_check_compat_vol tool from $(topdir)/utils
$VDS_CHECK_COMPAT_VOL_BIN
# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils
$VDS_ELINK_COMPAT_VOL_BIN
COMPAT_VOL=$?
# ############################################################################

8
tools/test/h5dump/testh5dumpvds.sh.in
View File

@@ -32,8 +32,8 @@ H5DIFF_BIN=`pwd`/$H5DIFF # The path of the h5diff tool binary
H5IMPORT=../../src/h5import/h5import # The h5import tool name
H5IMPORT_BIN=`pwd`/$H5IMPORT # The path of the h5import tool binary
VDS_CHECK_COMPAT_VOL=../../../utils/vds_check_compat_vol # The vds_check_compat_vol tool name
VDS_CHECK_COMPAT_VOL_BIN=`pwd`/$VDS_CHECK_COMPAT_VOL # The path of the vds_check_compat_vol tool binary
VDS_ELINK_COMPAT_VOL=../../../utils/vds_elink_compat_vol # The vds_elink_compat_vol tool name
VDS_ELINK_COMPAT_VOL_BIN=`pwd`/$VDS_ELINK_COMPAT_VOL # The path of the vds_elink_compat_vol tool binary
RM='rm -rf'
CMP='cmp -s'
@@ -505,8 +505,8 @@ COPY_TESTFILES_TO_TESTDIR
# Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR
# environment variable supports virtual datasets (and external links)
#
# Note: Depends on vds_check_compat_vol tool from $(topdir)/utils
$VDS_CHECK_COMPAT_VOL_BIN
# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils
$VDS_ELINK_COMPAT_VOL_BIN
COMPAT_VOL=$?
####### test for dataset vds ######

8
tools/test/h5ls/testh5ls.sh.in
View File

@@ -24,8 +24,8 @@ EXIT_FAILURE=1
H5LS=../../src/h5ls/h5ls # The tool name
H5LS_BIN=`pwd`/$H5LS # The path of the tool binary
VDS_CHECK_COMPAT_VOL=../../../utils/vds_check_compat_vol # The vds_check_compat_vol tool name
VDS_CHECK_COMPAT_VOL_BIN=`pwd`/$VDS_CHECK_COMPAT_VOL # The path of the vds_check_compat_vol tool binary
VDS_ELINK_COMPAT_VOL=../../../utils/vds_elink_compat_vol # The vds_elink_compat_vol tool name
VDS_ELINK_COMPAT_VOL_BIN=`pwd`/$VDS_ELINK_COMPAT_VOL # The path of the vds_elink_compat_vol tool binary
RM='rm -rf'
CMP='cmp -s'
@@ -321,8 +321,8 @@ COPY_TESTFILES_TO_TESTDIR
# Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR
# environment variable supports virtual datasets (and external links)
#
# Note: Depends on vds_check_compat_vol tool from $(topdir)/utils
$VDS_CHECK_COMPAT_VOL_BIN
# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils
$VDS_ELINK_COMPAT_VOL_BIN
COMPAT_VOL=$?
# Toss in a bunch of tests. Not sure if they are the right kinds.

8
tools/test/h5ls/testh5lsvds.sh.in
View File

@@ -21,8 +21,8 @@ EXIT_FAILURE=1
H5LS=../../src/h5ls/h5ls # The tool name
H5LS_BIN=`pwd`/$H5LS # The path of the tool binary
VDS_CHECK_COMPAT_VOL=../../../utils/vds_check_compat_vol # The vds_check_compat_vol tool name
VDS_CHECK_COMPAT_VOL_BIN=`pwd`/$VDS_CHECK_COMPAT_VOL # The path of the vds_check_compat_vol tool binary
VDS_ELINK_COMPAT_VOL=../../../utils/vds_elink_compat_vol # The vds_elink_compat_vol tool name
VDS_ELINK_COMPAT_VOL_BIN=`pwd`/$VDS_ELINK_COMPAT_VOL # The path of the vds_elink_compat_vol tool binary
RM='rm -rf'
CMP='cmp -s'
@@ -260,8 +260,8 @@ COPY_TESTFILES_TO_TESTDIR
# Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR
# environment variable supports virtual datasets (and external links)
#
# Note: Depends on vds_check_compat_vol tool from $(topdir)/utils
$VDS_CHECK_COMPAT_VOL_BIN
# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils
$VDS_ELINK_COMPAT_VOL_BIN
COMPAT_VOL=$?
####### test for dataset vds ######

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

@@ -39,8 +39,8 @@ H5DUMP_BIN=`pwd`/$H5DUMP # The path of the h5dump tool binary
H5STAT=../../src/h5stat/h5stat # The h5stat tool name
H5STAT_BIN=`pwd`/$H5STAT # The path of the h5stat tool binary
VDS_CHECK_COMPAT_VOL=../../../utils/vds_check_compat_vol # The vds_check_compat_vol tool name
VDS_CHECK_COMPAT_VOL_BIN=`pwd`/$VDS_CHECK_COMPAT_VOL # The path of the vds_check_compat_vol tool binary
VDS_ELINK_COMPAT_VOL=../../../utils/vds_elink_compat_vol # The vds_elink_compat_vol tool name
VDS_ELINK_COMPAT_VOL_BIN=`pwd`/$VDS_ELINK_COMPAT_VOL # The path of the vds_elink_compat_vol tool binary
RM='rm -rf'
CMP='cmp'
@@ -1342,8 +1342,8 @@ COPY_TESTFILES_TO_TESTDIR
# Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR
# environment variable supports virtual datasets (and external links)
#
# Note: Depends on vds_check_compat_vol tool from $(topdir)/utils
$VDS_CHECK_COMPAT_VOL_BIN
# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils
$VDS_ELINK_COMPAT_VOL_BIN
COMPAT_VOL=$?
TOOLTEST_HELP h5repack-help.txt -h

24
utils/CMakeLists.txt
View File

@@ -4,28 +4,28 @@ project (HDF5_UTILS C)
add_subdirectory (mirror_vfd)
#-----------------------------------------------------------------------------
# Add the vds_check_compat_vol executable
# Add the vds_elink_compat_vol executable
#-----------------------------------------------------------------------------
set (vds_check_compat_vol_SOURCES ${HDF5_UTILS_SOURCE_DIR}/vds_check_compat_vol.c)
add_executable (vds_check_compat_vol ${vds_check_compat_vol_SOURCES})
target_include_directories (vds_check_compat_vol PRIVATE "${HDF5_UTILS_DIR};${HDF5_SRC_DIR};${HDF5_TEST_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
set (vds_elink_compat_vol_SOURCES ${HDF5_UTILS_SOURCE_DIR}/vds_elink_compat_vol.c)
add_executable (vds_elink_compat_vol ${vds_elink_compat_vol_SOURCES})
target_include_directories (vds_elink_compat_vol PRIVATE "${HDF5_UTILS_DIR};${HDF5_SRC_DIR};${HDF5_TEST_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
if (NOT BUILD_SHARED_LIBS)
TARGET_C_PROPERTIES (vds_check_compat_vol STATIC)
target_link_libraries (vds_check_compat_vol PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
TARGET_C_PROPERTIES (vds_elink_compat_vol STATIC)
target_link_libraries (vds_elink_compat_vol PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
else ()
TARGET_C_PROPERTIES (vds_check_compat_vol SHARED)
target_link_libraries (vds_check_compat_vol PRIVATE ${HDF5_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
TARGET_C_PROPERTIES (vds_elink_compat_vol SHARED)
target_link_libraries (vds_elink_compat_vol PRIVATE ${HDF5_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
endif ()
set_target_properties (vds_check_compat_vol PROPERTIES FOLDER utils)
set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};vds_check_compat_vol")
set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} vds_check_compat_vol)
set_target_properties (vds_elink_compat_vol PROPERTIES FOLDER utils)
set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};vds_elink_compat_vol")
set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} vds_elink_compat_vol)
#-----------------------------------------------------------------------------
# Add Target to clang-format
#-----------------------------------------------------------------------------
if (HDF5_ENABLE_FORMATTERS)
clang_format (HDF5_UTILS_FORMAT vds_check_compat_vol)
clang_format (HDF5_UTILS_FORMAT vds_elink_compat_vol)
endif ()
##############################################################################

2
utils/Makefile.am
View File

@@ -25,7 +25,7 @@ SUBDIRS=mirror_vfd
AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/test
bin_PROGRAMS = vds_check_compat_vol
bin_PROGRAMS = vds_elink_compat_vol
# All programs depend on the hdf5 library
LDADD=$(LIBH5TEST) $(LIBHDF5)

12
utils/vds_check_compat_vol.c → utils/vds_elink_compat_vol.c
View File

@@ -12,7 +12,9 @@
/* Purpose: This is a small program that checks if the HDF5_VOL_CONNECTOR
* environment variable is set to a value that supports virtual
* datasets.
* datasets & external links. Currently that is limited to a
* VOL connector stack that is composed of _only_ the trivial
* single connector stack of the native VOL connector.
*
* It is intended for use in shell scripts.
*/
@@ -25,12 +27,12 @@
*
* Purpose: Uses the default file access property lists, which is
* initialized with the VOL connector from the HDF5_VOL_CONNECTOR
* environment variable to determine if virtual datasets are
* supported.
* environment variable to determine if virtual datasets & external
* links are supported.
*
* Return: VOL connector supports virtual datasets: EXIT_SUCCESS
* Return: VOL connector supports virtual datasets & external links: EXIT_SUCCESS
*
* VOL connector does not support virtual datasets
* VOL connector does not support virtual datasets & external links,
* or failure: EXIT_FAILURE
*
*-------------------------------------------------------------------------