summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorjhendersonHDF <jhenderson@hdfgroup.org>2022-09-16 16:17:30 (GMT)
committerGitHub <noreply@github.com>2022-09-16 16:17:30 (GMT)
commit16aa2dbaa0e70bf81f4329a70a45c601433549bb (patch)
tree7c6debf81d393d9294a2e6d79ca36b53d485348d /utils
parent45178c87a3099a9fef8bae6f7249ca306cf89629 (diff)
downloadhdf5-16aa2dbaa0e70bf81f4329a70a45c601433549bb.zip
hdf5-16aa2dbaa0e70bf81f4329a70a45c601433549bb.tar.gz
hdf5-16aa2dbaa0e70bf81f4329a70a45c601433549bb.tar.bz2
Subfiling VFD updates (#2106)
Diffstat (limited to 'utils')
-rw-r--r--utils/subfiling_vfd/CMakeLists.txt14
-rwxr-xr-xutils/subfiling_vfd/h5fuse.sh.in4
2 files changed, 14 insertions, 4 deletions
diff --git a/utils/subfiling_vfd/CMakeLists.txt b/utils/subfiling_vfd/CMakeLists.txt
index da5e44b..3acdc6b 100644
--- a/utils/subfiling_vfd/CMakeLists.txt
+++ b/utils/subfiling_vfd/CMakeLists.txt
@@ -1,10 +1,20 @@
cmake_minimum_required (VERSION 3.18)
project (HDF5_UTILS_SUBFILINGVFD C)
-configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.sh.in ${HDF5_BINARY_DIR}/h5fuse.sh @ONLY)
+configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.sh.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh @ONLY)
+
+# Copy h5fuse.sh to testpar directory for subfiling tests
+if (HDF5_ENABLE_PARALLEL AND HDF5_TEST_PARALLEL)
+ file (
+ COPY
+ ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh
+ DESTINATION
+ ${HDF5_TEST_PAR_BINARY_DIR}
+ )
+endif ()
install (
- FILES ${HDF5_BINARY_DIR}/h5fuse.sh
+ FILES ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh
DESTINATION ${HDF5_INSTALL_BIN_DIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT utilsapplications
diff --git a/utils/subfiling_vfd/h5fuse.sh.in b/utils/subfiling_vfd/h5fuse.sh.in
index b526b0b..dafaab9 100755
--- a/utils/subfiling_vfd/h5fuse.sh.in
+++ b/utils/subfiling_vfd/h5fuse.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Copyright by The HDF Group.
# All rights reserved.
@@ -49,7 +49,7 @@ while getopts ":h:f:" option; do
h) # display Help
usage
exit;;
- f) # subfiling configureation file
+ f) # subfiling configuration file
file_config=$OPTARG;;
\?) # Invalid option
echo -e "$RED ERROR: Invalid option ${BLD}-${OPTARG}${RED} $NC"