ci: sync with upstream

hyoklee · Sep 27, 2023 · 26a8a9d · 26a8a9d
2 parents ced0433 + 4233ae6
commit 26a8a9d
Show file tree

Hide file tree

Showing 1,254 changed files with 2,531 additions and 2,433 deletions.
diff --git a/.github/workflows/mac-cmake-flang-mpich.yml b/.github/workflows/mac-cmake-flang-mpich.yml
@@ -32,21 +32,45 @@ jobs:
     steps:
     - name: Install Dependencies (macOS)
       run: brew install llvm mpich ninja # carlocab/personal/flang
+    - name: Install flang
+      run : |
+      git clone https://github.com/llvm/llvm-project.git
+      mkdir build
+      mkdir install
+      ROOTDIR=`pwd`
+      INSTALLDIR=$ROOTDIR/install
+      echo $INSTALLDIR
+      cd build
+      cmake \
+        -G Ninja \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=$INSTALLDIR \
+        -DCMAKE_CXX_STANDARD=17 \
+        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+        -DCMAKE_CXX_LINK_FLAGS="-Wl,-rpath,$LD_LIBRARY_PATH" \
+        -DFLANG_ENABLE_WERROR=ON \
+        -DLLVM_ENABLE_ASSERTIONS=ON \
+        -DLLVM_TARGETS_TO_BUILD=host \
+        -DLLVM_LIT_ARGS=-v \
+        -DLLVM_ENABLE_PROJECTS="clang;mlir;flang;openmp" \
+        -DLLVM_ENABLE_RUNTIMES="compiler-rt" \
+        ../llvm-project/llvm
+      ninja
 
     - name: Get Sources
       uses: actions/checkout@v4
 
     - name: Configure
       run: |
-        export PATH="/usr/local/opt/llvm/bin:$PATH"
-        export LDFLAGS="-L/usr/local/opt/llvm/lib"
-        export CPPFLAGS="-I/usr/local/opt/llvm/include"
-        export CFLAGS="-I/usr/local/opt/llvm/include"
-        # which flang-new
-        # export FC="$(which flang-new)"
+        export PATH="/Users/runner/work/actions/actions/install/bin:/usr/local/opt/llvm/bin:$PATH"
+        export LDFLAGS="-L/Users/runner/work/actions/actions/install/lib -L/usr/local/opt/llvm/lib"
+        export CPPFLAGS="-I/Users/runner/work/actions/actions/install/include -I/usr/local/opt/llvm/include"
+        export CFLAGS="-I/Users/runner/work/actions/actions/install/include -I/usr/local/opt/llvm/include"
+        which flang-new
+        export FC="$(which flang-new)"
         export CC="$(which clang)"
         echo $CC
-        # echo $FC
+        echo $FC
         mkdir "${{ runner.workspace }}/build"
         cd "${{ runner.workspace }}/build"
         cmake ${{ matrix.generator }} \

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
@@ -394,7 +394,11 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${HDF5_PACKAGE_URL}")
     set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}")
     if (BUILD_SHARED_LIBS)
-      set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}")
+      if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer")
+        set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}")
+      else ()
+        set (WIX_CMP_NAME "${HDF5_LIB_NAME}")
+      endif ()
       configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF5_BINARY_DIR}/patch.xml @ONLY)
       set(CPACK_WIX_PATCH_FILE "${HDF5_BINARY_DIR}/patch.xml")
     endif ()

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -222,6 +222,7 @@ set (HDF5_HL_CPP_SRC_DIR       ${HDF5_SOURCE_DIR}/hl/c++)
 set (HDF5_HL_TOOLS_DIR         ${HDF5_SOURCE_DIR}/hl/tools)
 set (HDF5_TOOLS_DIR            ${HDF5_SOURCE_DIR}/tools)
 set (HDF5_TOOLS_SRC_DIR        ${HDF5_SOURCE_DIR}/tools/src)
+set (HDF5_TOOLS_TST_DIR        ${HDF5_SOURCE_DIR}/tools/test)
 set (HDF5_PERFORM_SRC_DIR      ${HDF5_SOURCE_DIR}/tools/src/perform)
 set (HDF5_UTILS_DIR            ${HDF5_SOURCE_DIR}/utils)
 set (HDF5_F90_SRC_DIR          ${HDF5_SOURCE_DIR}/fortran)

diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake
@@ -66,7 +66,7 @@ else ()
     endif ()
   elseif (TEST_FUNCTION MATCHES "LTEQ")
     if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-      message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
     else ()
       message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
     endif ()

diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake
@@ -41,7 +41,7 @@ set (HL_REFERENCE_TEST_FILES
 #-- Copy the necessary files.
 # --------------------------------------------------------------------
 foreach (h5_file ${HL_REFERENCE_TEST_FILES})
-  HDFTEST_COPY_FILE("${HDF5_HL_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_HL_TEST_BINARY_DIR}/${h5_file}" "hl_test_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_HL_TEST_BINARY_DIR}/testfiles/${h5_file}" "hl_test_files")
 endforeach ()
 add_custom_target(hl_test_files ALL COMMENT "Copying files needed by hl_test tests" DEPENDS ${hl_test_files_list})
 

diff --git a/hl/test/dsdata.txt → hl/test/testfiles/dsdata.txt b/hl/test/dsdata.txt → hl/test/testfiles/dsdata.txt
diff --git a/hl/test/dslat.txt → hl/test/testfiles/dslat.txt b/hl/test/dslat.txt → hl/test/testfiles/dslat.txt
diff --git a/hl/test/dslon.txt → hl/test/testfiles/dslon.txt b/hl/test/dslon.txt → hl/test/testfiles/dslon.txt
diff --git a/hl/test/dtype_file.txt → hl/test/testfiles/dtype_file.txt b/hl/test/dtype_file.txt → hl/test/testfiles/dtype_file.txt
diff --git a/hl/test/dtype_file_readable.txt → hl/test/testfiles/dtype_file_readable.txt b/hl/test/dtype_file_readable.txt → hl/test/testfiles/dtype_file_readable.txt
diff --git a/hl/test/earth.pal → hl/test/testfiles/earth.pal b/hl/test/earth.pal → hl/test/testfiles/earth.pal
diff --git a/hl/test/image24pixel.txt → hl/test/testfiles/image24pixel.txt b/hl/test/image24pixel.txt → hl/test/testfiles/image24pixel.txt
diff --git a/hl/test/image24plane.txt → hl/test/testfiles/image24plane.txt b/hl/test/image24plane.txt → hl/test/testfiles/image24plane.txt
diff --git a/hl/test/image8.txt → hl/test/testfiles/image8.txt b/hl/test/image8.txt → hl/test/testfiles/image8.txt
diff --git a/hl/test/sepia.pal → hl/test/testfiles/sepia.pal b/hl/test/sepia.pal → hl/test/testfiles/sepia.pal
diff --git a/hl/test/test_ds_be.h5 → hl/test/testfiles/test_ds_be.h5 b/hl/test/test_ds_be.h5 → hl/test/testfiles/test_ds_be.h5
diff --git a/hl/test/test_ds_be_new_ref-32bit.h5 → ...est/testfiles/test_ds_be_new_ref-32bit.h5 b/hl/test/test_ds_be_new_ref-32bit.h5 → ...est/testfiles/test_ds_be_new_ref-32bit.h5
diff --git a/hl/test/test_ds_be_new_ref.h5 → hl/test/testfiles/test_ds_be_new_ref.h5 b/hl/test/test_ds_be_new_ref.h5 → hl/test/testfiles/test_ds_be_new_ref.h5
diff --git a/hl/test/test_ds_le.h5 → hl/test/testfiles/test_ds_le.h5 b/hl/test/test_ds_le.h5 → hl/test/testfiles/test_ds_le.h5
diff --git a/hl/test/test_ds_le_new_ref.h5 → hl/test/testfiles/test_ds_le_new_ref.h5 b/hl/test/test_ds_le_new_ref.h5 → hl/test/testfiles/test_ds_le_new_ref.h5
diff --git a/hl/test/test_ld.h5 → hl/test/testfiles/test_ld.h5 b/hl/test/test_ld.h5 → hl/test/testfiles/test_ld.h5
diff --git a/hl/test/test_table_be.h5 → hl/test/testfiles/test_table_be.h5 b/hl/test/test_table_be.h5 → hl/test/testfiles/test_table_be.h5
diff --git a/hl/test/test_table_cray.h5 → hl/test/testfiles/test_table_cray.h5 b/hl/test/test_table_cray.h5 → hl/test/testfiles/test_table_cray.h5
diff --git a/hl/test/test_table_le.h5 → hl/test/testfiles/test_table_le.h5 b/hl/test/test_table_le.h5 → hl/test/testfiles/test_table_le.h5
diff --git a/hl/test/usa.wri → hl/test/testfiles/usa.wri b/hl/test/usa.wri → hl/test/testfiles/usa.wri
diff --git a/hl/tools/gif2h5/CMakeTests.cmake b/hl/tools/gif2h5/CMakeTests.cmake
@@ -22,9 +22,9 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 #
 # copy test files from source to build dir
 #
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files")
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files")
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files")
 add_custom_target(gif2h5_files ALL COMMENT "Copying files needed by gif2h5 tests" DEPENDS ${gif2h5_files_list})
 
 # Remove any output file left over from previous test run

diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake
@@ -58,7 +58,7 @@ set (H5WATCH_TEST_FILES
 file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
 foreach (h5watch_file ${H5WATCH_TEST_FILES})
-  HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files")
 endforeach ()
 add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tests" DEPENDS ${H5WATCH_files_list})
 

diff --git a/hl/tools/testfiles/w-err-cmpd1.err → hl/tools/h5watch/testfiles/w-err-cmpd1.err b/hl/tools/testfiles/w-err-cmpd1.err → hl/tools/h5watch/testfiles/w-err-cmpd1.err
diff --git a/hl/tools/testfiles/w-err-cmpd2.err → hl/tools/h5watch/testfiles/w-err-cmpd2.err b/hl/tools/testfiles/w-err-cmpd2.err → hl/tools/h5watch/testfiles/w-err-cmpd2.err
diff --git a/hl/tools/testfiles/w-err-cmpd3.err → hl/tools/h5watch/testfiles/w-err-cmpd3.err b/hl/tools/testfiles/w-err-cmpd3.err → hl/tools/h5watch/testfiles/w-err-cmpd3.err
diff --git a/hl/tools/testfiles/w-err-cmpd4.err → hl/tools/h5watch/testfiles/w-err-cmpd4.err b/hl/tools/testfiles/w-err-cmpd4.err → hl/tools/h5watch/testfiles/w-err-cmpd4.err
diff --git a/hl/tools/testfiles/w-err-cmpd5.err → hl/tools/h5watch/testfiles/w-err-cmpd5.err b/hl/tools/testfiles/w-err-cmpd5.err → hl/tools/h5watch/testfiles/w-err-cmpd5.err
diff --git a/hl/tools/testfiles/w-err-dset-nomax.err → ...ls/h5watch/testfiles/w-err-dset-nomax.err b/hl/tools/testfiles/w-err-dset-nomax.err → ...ls/h5watch/testfiles/w-err-dset-nomax.err
diff --git a/hl/tools/testfiles/w-err-dset-none.err → ...ols/h5watch/testfiles/w-err-dset-none.err b/hl/tools/testfiles/w-err-dset-none.err → ...ols/h5watch/testfiles/w-err-dset-none.err
diff --git a/hl/tools/testfiles/w-err-dset1.err → hl/tools/h5watch/testfiles/w-err-dset1.err b/hl/tools/testfiles/w-err-dset1.err → hl/tools/h5watch/testfiles/w-err-dset1.err
diff --git a/hl/tools/testfiles/w-err-dset2.err → hl/tools/h5watch/testfiles/w-err-dset2.err b/hl/tools/testfiles/w-err-dset2.err → hl/tools/h5watch/testfiles/w-err-dset2.err
diff --git a/hl/tools/testfiles/w-err-file.err → hl/tools/h5watch/testfiles/w-err-file.err b/hl/tools/testfiles/w-err-file.err → hl/tools/h5watch/testfiles/w-err-file.err
diff --git a/hl/tools/testfiles/w-err-poll.ddl → hl/tools/h5watch/testfiles/w-err-poll.ddl b/hl/tools/testfiles/w-err-poll.ddl → hl/tools/h5watch/testfiles/w-err-poll.ddl
diff --git a/hl/tools/testfiles/w-err-poll0.ddl → hl/tools/h5watch/testfiles/w-err-poll0.ddl b/hl/tools/testfiles/w-err-poll0.ddl → hl/tools/h5watch/testfiles/w-err-poll0.ddl
diff --git a/hl/tools/testfiles/w-err-std.ddl → hl/tools/h5watch/testfiles/w-err-std.ddl b/hl/tools/testfiles/w-err-std.ddl → hl/tools/h5watch/testfiles/w-err-std.ddl
diff --git a/hl/tools/testfiles/w-err-width.ddl → hl/tools/h5watch/testfiles/w-err-width.ddl b/hl/tools/testfiles/w-err-width.ddl → hl/tools/h5watch/testfiles/w-err-width.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl → ...s/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl → ...s/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl → ...s/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl → ...s/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl → .../h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl → .../h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-esc.ddl b/hl/tools/testfiles/w-ext-cmpd-esc.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-esc.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-f1.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl b/hl/tools/testfiles/w-ext-cmpd-f1.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-f2.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl b/hl/tools/testfiles/w-ext-cmpd-f2.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-ff3.ddl b/hl/tools/testfiles/w-ext-cmpd-ff3.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-ff3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-label.ddl → ...ls/h5watch/testfiles/w-ext-cmpd-label.ddl b/hl/tools/testfiles/w-ext-cmpd-label.ddl → ...ls/h5watch/testfiles/w-ext-cmpd-label.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl → ...s/h5watch/testfiles/w-ext-cmpd-two-f1.ddl b/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl → ...s/h5watch/testfiles/w-ext-cmpd-two-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl → ...s/h5watch/testfiles/w-ext-cmpd-two-f3.ddl b/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl → ...s/h5watch/testfiles/w-ext-cmpd-two-f3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl → .../h5watch/testfiles/w-ext-cmpd-two-ff2.ddl b/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl → .../h5watch/testfiles/w-ext-cmpd-two-ff2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-two.ddl b/hl/tools/testfiles/w-ext-cmpd-two.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-two.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd.ddl b/hl/tools/testfiles/w-ext-cmpd.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd.ddl
diff --git a/hl/tools/testfiles/w-ext-early.ddl → hl/tools/h5watch/testfiles/w-ext-early.ddl b/hl/tools/testfiles/w-ext-early.ddl → hl/tools/h5watch/testfiles/w-ext-early.ddl
diff --git a/hl/tools/testfiles/w-ext-late.ddl → hl/tools/h5watch/testfiles/w-ext-late.ddl b/hl/tools/testfiles/w-ext-late.ddl → hl/tools/h5watch/testfiles/w-ext-late.ddl
diff --git a/hl/tools/testfiles/w-ext-one-d.ddl → hl/tools/h5watch/testfiles/w-ext-one-d.ddl b/hl/tools/testfiles/w-ext-one-d.ddl → hl/tools/h5watch/testfiles/w-ext-one-d.ddl
diff --git a/hl/tools/testfiles/w-ext-one-simple.ddl → ...ls/h5watch/testfiles/w-ext-one-simple.ddl b/hl/tools/testfiles/w-ext-one-simple.ddl → ...ls/h5watch/testfiles/w-ext-one-simple.ddl
diff --git a/hl/tools/testfiles/w-ext-one.ddl → hl/tools/h5watch/testfiles/w-ext-one.ddl b/hl/tools/testfiles/w-ext-one.ddl → hl/tools/h5watch/testfiles/w-ext-one.ddl
diff --git a/hl/tools/testfiles/w-ext-two-d.ddl → hl/tools/h5watch/testfiles/w-ext-two-d.ddl b/hl/tools/testfiles/w-ext-two-d.ddl → hl/tools/h5watch/testfiles/w-ext-two-d.ddl
diff --git a/hl/tools/testfiles/w-ext-two-width.ddl → ...ols/h5watch/testfiles/w-ext-two-width.ddl b/hl/tools/testfiles/w-ext-two-width.ddl → ...ols/h5watch/testfiles/w-ext-two-width.ddl
diff --git a/hl/tools/testfiles/w-ext-two.ddl → hl/tools/h5watch/testfiles/w-ext-two.ddl b/hl/tools/testfiles/w-ext-two.ddl → hl/tools/h5watch/testfiles/w-ext-two.ddl
diff --git a/hl/tools/testfiles/w-help1.ddl → hl/tools/h5watch/testfiles/w-help1.ddl b/hl/tools/testfiles/w-help1.ddl → hl/tools/h5watch/testfiles/w-help1.ddl
diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in
@@ -66,7 +66,7 @@ fi
 nerrors=0
 verbose=yes
 
-test -d ../testfiles || mkdir ../testfiles
+test -d ./testfiles || mkdir ./testfiles
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
@@ -97,9 +97,9 @@ TESTING() {
 # $2 -- expected return code
 # $3 and on -- arguments for h5watch
 TOOLTEST() {
-    expect="$srcdir/../testfiles/$1"
-    actual="../testfiles/`basename $1 .ddl`.out"
-    actual_err="../testfiles/`basename $1 .ddl`.err"
+    expect="$srcdir/testfiles/$1"
+    actual="testfiles/`basename $1 .ddl`.out"
+    actual_err="testfiles/`basename $1 .ddl`.err"
     shift
     retvalexpect=$1
     shift
@@ -146,10 +146,10 @@ TOOLTEST() {
 # $2 -- expected return code
 # $3 and on -- arguments for h5watch
 TOOLTEST_ERR() {
-    expect="$srcdir/../testfiles/$1"
-    expect_err="$srcdir/../testfiles/`basename $1 .ddl`.err"
-    actual="../testfiles/`basename $1 .ddl`.out"
-    actual_err="../testfiles/`basename $1 .ddl`.out.err"
+    expect="$srcdir/testfiles/$1"
+    expect_err="$srcdir/testfiles/`basename $1 .ddl`.err"
+    actual="testfiles/`basename $1 .ddl`.out"
+    actual_err="testfiles/`basename $1 .ddl`.out.err"
     shift
     retvalexpect=$1
     shift
@@ -201,8 +201,8 @@ try=0
 while [ $try -lt $TRY_MAX ] ;
 do
     cp $WATCHFILE $TESTFILE                             # Copy the file being watched/extended to a temporary file
-    actual="../testfiles/`basename $3 .ddl`.out"        # The actual output
-    expect="$srcdir/../testfiles/$3"                    # The expected output
+    actual="testfiles/`basename $3 .ddl`.out"        # The actual output
+    expect="$srcdir/testfiles/$3"                    # The expected output
     #
     # Set up options and object to h5watch
     if test -z "$2"; then

diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
@@ -104,12 +104,12 @@ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_
 HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 
 add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_files_list})
 
@@ -248,12 +248,12 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
         HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
         HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
         HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
 
         add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files_list})
 

diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
@@ -46,7 +46,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
 BLDDIR="."
 BLDLIBDIR="$BLDDIR/testlibs"
 HDFTEST_HOME="$top_srcdir/java/test"
-TOOLS_TESTFILES="$top_srcdir/tools/testfiles"
+DUMP_TESTFILES="$top_srcdir/tools/test/h5dump/testfiles"
 
 JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
 TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
@@ -258,12 +258,12 @@ COPY_DATAFILES_TO_BLDDIR()
     $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateL2.hdf
     $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateO1.hdf
     $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateO2.hdf
-    $CP -f $TOOLS_TESTFILES/trefer_reg.h5 $BLDDIR/trefer_reg.h5
-    $CP -f $TOOLS_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5
-    $CP -f $TOOLS_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5
-    $CP -f $TOOLS_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5
-    $CP -f $TOOLS_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5
-    $CP -f $TOOLS_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5
+    $CP -f $DUMP_TESTFILES/trefer_reg.h5 $BLDDIR/trefer_reg.h5
+    $CP -f $DUMP_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5
+    $CP -f $DUMP_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5
+    $CP -f $DUMP_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5
+    $CP -f $DUMP_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5
+    $CP -f $DUMP_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5
 }
 
 CLEAN_DATAFILES_AND_BLDDIR()

diff --git a/src/H5.c b/src/H5.c
@@ -275,7 +275,7 @@ H5_init_library(void)
 
     /* Debugging? */
     H5__debug_mask("-all");
-    H5__debug_mask(HDgetenv("HDF5_DEBUG"));
+    H5__debug_mask(getenv("HDF5_DEBUG"));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -887,7 +887,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
         const char *s; /* Environment string for disabling version check */
 
         /* Allow different versions of the header files and library? */
-        s = HDgetenv("HDF5_DISABLE_VERSION_CHECK");
+        s = getenv("HDF5_DISABLE_VERSION_CHECK");
 
         if (s && isdigit(*s))
             disable_version_check = (unsigned int)strtol(s, NULL, 0);