diff --git a/configure.ac b/configure.ac index 44ab43a4664..30f5d2caeaa 100644 --- a/configure.ac +++ b/configure.ac @@ -4236,10 +4236,10 @@ AC_CONFIG_FILES([Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh]) -AC_CONFIG_FILES([utils/subfiling_vfd/h5fuse.sh], [chmod +x utils/subfiling_vfd/h5fuse.sh]) +AC_CONFIG_FILES([utils/subfiling_vfd/h5fuse], [chmod +x utils/subfiling_vfd/h5fuse]) if test -n "$TESTPARALLEL"; then if test "X$SUBFILING_VFD" = "Xyes"; then - AC_CONFIG_LINKS([testpar/h5fuse.sh:utils/subfiling_vfd/h5fuse.sh]) + AC_CONFIG_LINKS([testpar/h5fuse:utils/subfiling_vfd/h5fuse]) fi fi diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 5dd36ea101c..5e853783f8a 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -920,6 +920,12 @@ Bug Fixes since HDF5-1.14.0 release Tools ----- + + - Renamed h5fuse.sh to h5fuse + + Addresses Discussion #3791 + + - Fixed an issue with unmatched MPI messages in ph5diff The "manager" MPI rank in ph5diff was unintentionally sending "program end" diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 72613a3bef1..45cb363fd6a 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -1898,7 +1898,7 @@ test_subfiling_h5fuse(void) if (MAINPROCESS) { FILE *h5fuse_script; - h5fuse_script = fopen("h5fuse.sh", "r"); + h5fuse_script = fopen("h5fuse", "r"); if (h5fuse_script) fclose(h5fuse_script); else @@ -2014,7 +2014,7 @@ test_subfiling_h5fuse(void) SUBF_FILENAME, file_inode); args[0] = strdup("env"); - args[1] = strdup("./h5fuse.sh"); + args[1] = strdup("./h5fuse"); args[2] = strdup("-q"); args[3] = strdup("-f"); args[4] = tmp_filename; diff --git a/utils/Makefile.am b/utils/Makefile.am index 229712e6aaf..740f5c36fbf 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -41,6 +41,6 @@ endif # All subdirectories SUBDIRS=$(MIRROR_VFD_DIR) $(TESTUTIL_DIR) $(TOOLS_DIR) -bin_SCRIPTS = subfiling_vfd/h5fuse.sh +bin_SCRIPTS = subfiling_vfd/h5fuse include $(top_srcdir)/config/conclude.am diff --git a/utils/subfiling_vfd/CMakeLists.txt b/utils/subfiling_vfd/CMakeLists.txt index 3acdc6bc24f..62b62557a27 100644 --- a/utils/subfiling_vfd/CMakeLists.txt +++ b/utils/subfiling_vfd/CMakeLists.txt @@ -1,20 +1,20 @@ cmake_minimum_required (VERSION 3.18) project (HDF5_UTILS_SUBFILINGVFD C) -configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.sh.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh @ONLY) +configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse @ONLY) -# Copy h5fuse.sh to testpar directory for subfiling tests +# Copy h5fuse to testpar directory for subfiling tests if (HDF5_ENABLE_PARALLEL AND HDF5_TEST_PARALLEL) file ( COPY - ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh + ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse DESTINATION ${HDF5_TEST_PAR_BINARY_DIR} ) endif () install ( - FILES ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh + FILES ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse 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.in similarity index 98% rename from utils/subfiling_vfd/h5fuse.sh.in rename to utils/subfiling_vfd/h5fuse.in index 6f4bf619bbe..a4c6a053cc0 100755 --- a/utils/subfiling_vfd/h5fuse.sh.in +++ b/utils/subfiling_vfd/h5fuse.in @@ -26,11 +26,11 @@ function usage { configuration file either as a command-line argument or the script will search for the *.config file in the current directory." echo "" - echo "usage: h5fuse.sh [-f filename] [-h] [-p] [-q] [-r] [-v] " + echo "usage: h5fuse [-f filename] [-h] [-p] [-q] [-r] [-v] " echo "-f filename Subfile configuration file." echo "-h Print this help." echo "-q Quiet all output. [no]" - echo "-p h5fuse.sh is being run in parallel, with more than one rank. [no]" + echo "-p h5fuse is being run in parallel, with more than one rank. [no]" echo "-r Remove subfiles after being processed. [no]" echo "-v Verbose output. [no]" echo ""