From 82b61574e1eb5f157d289185656eb877c3a33582 Mon Sep 17 00:00:00 2001
From: "H. Joe Lee" <hyoklee@hdfgroup.org>
Date: Thu, 14 Oct 2021 22:06:42 -0500
Subject: OESS-168: Remove clang warnings. (#1072)

* OESS-168: Remove clang warnings.

* Committing clang-format changes

* Address review by @jehndersonHDF.

* Address review by @jehndersonHDF.

* OESS-168: Fix CI failure.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 test/dsets.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/dsets.c b/test/dsets.c
index 5e80ef7..a4b5757 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1399,7 +1399,7 @@ test_conv_buffer(hid_t fid)
         cf->b[j] = 100.0F * (float)(j + 1) + 0.01F * (float)j;
 
     for (j = 0; j < DIM3; j++)
-        cf->c[j] = 100.0F * (float)(j + 1) + 0.02F * (float)j;
+        cf->c[j] = 100.0 * (double)(j + 1) + 0.02 * (double)j;
 
     /* Create data space */
     if ((space = H5Screate(H5S_SCALAR)) < 0)
@@ -3442,11 +3442,11 @@ test_nbit_double(hid_t file)
     /* orig_data[] are initialized to be within the range that can be represented by
      * dataset datatype (no precision loss during datatype conversion)
      */
-    double orig_data[2][5] = {{(double)1.6081706885101836e+60L, -255.32099170994480f,
-                               (double)1.2677579992621376e-61L, 64568.289448797700f,
+    double orig_data[2][5] = {{(double)1.6081706885101836e+60L, -255.32099170994480,
+                               (double)1.2677579992621376e-61L, 64568.289448797700,
                                (double)-1.0619721778839084e-75L},
-                              {(double)2.1499497833454840e+56L, 6.6562295504670740e-3f, -1.5747263393432150f,
-                               1.0711093225222612f, -9.8971679387636870e-1f}};
+                              {(double)2.1499497833454840e+56L, 6.6562295504670740e-3, -1.5747263393432150,
+                               1.0711093225222612, -9.8971679387636870e-1}};
     double new_data[2][5];
     size_t precision, offset;
     size_t i, j;
@@ -5201,7 +5201,7 @@ test_scaleoffset_float(hid_t file)
     /* Check that the values read are the same as the values written */
     for (i = 0; i < (size_t)size[0]; i++) {
         for (j = 0; j < (size_t)size[1]; j++) {
-            if (HDfabs(new_data[i][j] - orig_data[i][j]) > HDpow(10.0, -3.0)) {
+            if (HDfabs((double)(new_data[i][j] - orig_data[i][j])) > HDpow(10.0, -3.0)) {
                 H5_FAILED();
                 HDprintf("    Read different values than written.\n");
                 HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
@@ -5347,7 +5347,7 @@ test_scaleoffset_float_2(hid_t file)
 
     /* Check that the values read are the same as the values written */
     for (j = 0; j < (size_t)size[1]; j++) {
-        if (HDfabs(new_data[0][j] - orig_data[0][j]) > HDpow(10.0, -3.0)) {
+        if (HDfabs((double)(new_data[0][j] - orig_data[0][j])) > HDpow(10.0, -3.0)) {
             H5_FAILED();
             HDprintf("    Read different values than written.\n");
             HDprintf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
@@ -5435,7 +5435,7 @@ test_scaleoffset_double(hid_t file)
     /* Initialize data */
     for (i = 0; i < (size_t)size[0]; i++)
         for (j = 0; j < (size_t)size[1]; j++) {
-            orig_data[i][j] = (float)(HDrandom() % 10000000) / 10000000.0F;
+            orig_data[i][j] = (HDrandom() % 10000000) / 10000000.0;
 
             /* even-numbered values are negtive */
             if ((i * size[1] + j + 1) % 2 == 0)
@@ -5544,7 +5544,7 @@ test_scaleoffset_double_2(hid_t file)
         goto error;
 
     /* Set fill value */
-    fillval = 10000.0F;
+    fillval = 10000.0;
     if (H5Pset_fill_value(dc, H5T_NATIVE_DOUBLE, &fillval) < 0)
         goto error;
 
@@ -5581,7 +5581,7 @@ test_scaleoffset_double_2(hid_t file)
 
     /* Initialize data of hyperslab */
     for (j = 0; j < (size_t)size[1]; j++) {
-        orig_data[0][j] = (float)(HDrandom() % 10000000) / 10000000.0F;
+        orig_data[0][j] = (HDrandom() % 10000000) / 10000000.0;
 
         /* even-numbered values are negtive */
         if ((j + 1) % 2 == 0)
@@ -5614,7 +5614,7 @@ test_scaleoffset_double_2(hid_t file)
 
     /* Check that the values read are the same as the values written */
     for (j = 0; j < (size_t)size[1]; j++) {
-        if (HDfabs(new_data[0][j] - orig_data[0][j]) > HDpow(10.0, -7.0)) {
+        if (HDfabs((double)(new_data[0][j] - orig_data[0][j])) > HDpow(10.0, -7.0)) {
             H5_FAILED();
             HDprintf("    Read different values than written.\n");
             HDprintf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
@@ -6525,7 +6525,7 @@ test_set_local(hid_t fapl)
     h5_fixname(FILENAME[5], fapl, filename, sizeof filename);
 
     /* Initialize the integer & floating-point dataset */
-    n = 1.0F;
+    n = 1.0;
     for (i = 0; i < DSET_DIM1; i++)
         for (j = 0; j < DSET_DIM2; j++) {
             points[i][j]     = (int)n++;
@@ -9085,7 +9085,7 @@ test_big_chunks_bypass_cache(hid_t fapl)
     /* Define cache size to be smaller than chunk size */
     rdcc_nelmts = BYPASS_CHUNK_DIM / 5;
     rdcc_nbytes = sizeof(int) * BYPASS_CHUNK_DIM / 5;
-    if (H5Pset_cache(fapl_local, 0, rdcc_nelmts, rdcc_nbytes, 0.0F) < 0)
+    if (H5Pset_cache(fapl_local, 0, rdcc_nelmts, rdcc_nbytes, 0.0) < 0)
         FAIL_STACK_ERROR
 
     /* Create file */
-- 
cgit v0.12


From c196bf98eb7fe71c262e88b0227ea81906b9dbcf Mon Sep 17 00:00:00 2001
From: "H. Joe Lee" <hyoklee@hdfgroup.org>
Date: Wed, 20 Oct 2021 08:09:30 -0500
Subject: OESS-168: Remove clang warnings. (#1075)

* OESS-168: Remove clang warnings.

* Committing clang-format changes

* OESS-168: Fix CI failure.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 test/dt_arith.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/dt_arith.c b/test/dt_arith.c
index 91e31d5..4cdb020 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -2707,7 +2707,7 @@ my_isnan(dtype_t type, void *val)
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
     }
     else if (FLT_LDOUBLE == type) {
-        long double x = 0.0;
+        long double x = 0.0L;
         HDmemcpy(&x, val, sizeof(long double));
         retval = (x != x);
 #endif
@@ -2735,7 +2735,7 @@ my_isnan(dtype_t type, void *val)
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
         }
         else if (FLT_LDOUBLE == type) {
-            long double x = 0.0;
+            long double x = 0.0L;
 
             HDmemcpy(&x, val, sizeof(long double));
             HDsnprintf(s, sizeof(s), "%Lg", x);
@@ -3059,7 +3059,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
     for (j = 0; j < nelmts; j++) {
         underflow = 0;
         hw_f      = 911.0F;
-        hw_d      = 911.0F;
+        hw_d      = 911.0;
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         hw_ld = 911.0L;
 #endif
@@ -3108,14 +3108,14 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
             if (FLT_FLOAT == dst_type) {
                 hw_f      = (float)*((long double *)aligned);
                 hw        = (unsigned char *)&hw_f;
-                underflow = HDfabsl(*((long double *)aligned)) < FLT_MIN;
-                overflow  = HDfabsl(*((long double *)aligned)) > FLT_MAX;
+                underflow = HDfabsl(*((long double *)aligned)) < (long double)FLT_MIN;
+                overflow  = HDfabsl(*((long double *)aligned)) > (long double)FLT_MAX;
             }
             else if (FLT_DOUBLE == dst_type) {
                 hw_d      = (double)*((long double *)aligned);
                 hw        = (unsigned char *)&hw_d;
-                underflow = HDfabsl(*((long double *)aligned)) < DBL_MIN;
-                overflow  = HDfabsl(*((long double *)aligned)) > DBL_MAX;
+                underflow = HDfabsl(*((long double *)aligned)) < (long double)DBL_MIN;
+                overflow  = HDfabsl(*((long double *)aligned)) > (long double)DBL_MAX;
             }
             else {
                 hw_ld = *((long double *)aligned);
@@ -3204,8 +3204,8 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
                 if (overflow && my_isinf(dendian, buf + j * sizeof(float), dst_size, dst_mpos, dst_msize,
                                          dst_epos, dst_esize))
                     continue; /* all overflowed, no error */
-                check_mant[0] = HDfrexpf(x, check_expo + 0);
-                check_mant[1] = HDfrexpf(hw_f, check_expo + 1);
+                check_mant[0] = (double)HDfrexpf(x, check_expo + 0);
+                check_mant[1] = (double)HDfrexpf(hw_f, check_expo + 1);
             }
             else if (FLT_DOUBLE == dst_type) {
                 double x = 0.0;
@@ -3220,7 +3220,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
 #if H5_SIZEOF_LONG_DOUBLE != 0 && (H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE)
             }
             else {
-                long double x = 0.0;
+                long double x = 0.0L;
                 HDmemcpy(&x, &buf[j * dst_size], sizeof(long double));
                 /* dst is largest float, no need to check underflow. */
                 check_mant[0] = (double)HDfrexpl(x, check_expo + 0);
@@ -3278,7 +3278,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         }
         else {
-            long double x = 0.0;
+            long double x = 0.0L;
             HDmemcpy(&x, &saved[j * src_size], sizeof(long double));
             HDfprintf(stdout, " %29.20Le\n", x);
 #endif
@@ -3300,7 +3300,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         }
         else {
-            long double x = 0.0;
+            long double x = 0.0L;
             HDmemcpy(&x, &buf[j * dst_size], sizeof(long double));
             HDfprintf(stdout, " %29.20Le\n", x);
 #endif
-- 
cgit v0.12


From 6d4d0fb13db06895fc6ea5f98ae0b79b44aa98af Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Wed, 20 Oct 2021 08:25:06 -0500
Subject: Move test utilities to utils/test folder (#1109)

* Move test utilities to utils/test folder

* Fix makefile assignment

* Add new dir

* add new folder

* Correct copied makefile

* Fix dir typo

* Add missing include dir

* Remove unnecessary lib link

* Correct dependent dirs

* Fix conditional checks

* Disable test if not built

* fix path to executable

* Use fixture for swmr_vfd check

* Add release note

* Correct shell tests and c++ flag warning

* Update autotools c++ warning

* Fix typo
---
 CMakeLists.txt                           |  5 +--
 MANIFEST                                 | 11 +++++-
 c++/test/CMakeVFDTests.cmake             | 33 +---------------
 config/cmake/HDF5Macros.cmake            | 37 +++++++++++++++++
 config/cmake/HDFCXXCompilerFlags.cmake   |  4 +-
 config/gnu-cxxflags                      |  4 +-
 config/gnu-warnings/cxx-developer-4.8    | 16 ++++++++
 config/gnu-warnings/no-cxx-developer-4.8 |  9 +++++
 configure.ac                             |  1 +
 hl/tools/h5watch/CMakeLists.txt          | 23 -----------
 hl/tools/h5watch/CMakeTests.cmake        | 68 +++++++++++++++++---------------
 hl/tools/h5watch/Makefile.am             |  3 +-
 hl/tools/h5watch/swmr_check_compat_vfd.c | 55 --------------------------
 hl/tools/h5watch/testh5watch.sh.in       |  8 +++-
 release_docs/RELEASE.txt                 | 12 +++++-
 test/CMakeLists.txt                      | 43 ++++++++++----------
 test/CMakeTests.cmake                    |  2 -
 test/CMakeVFDTests.cmake                 | 33 +---------------
 test/Makefile.am                         | 14 +++++--
 test/ShellTests.cmake                    |  9 +++--
 test/swmr_check_compat_vfd.c             | 53 -------------------------
 test/test_usecases.sh.in                 | 32 ++++++++++++---
 test/testflushrefresh.sh.in              | 24 ++++++++---
 test/testswmr.sh.in                      | 38 ++++++++++--------
 test/testvdsswmr.sh.in                   | 12 ++++--
 testpar/CMakeVFDTests.cmake              | 34 +---------------
 tools/test/h5dump/CMakeVFDTests.cmake    | 19 ++-------
 tools/test/h5repack/CMakeVFDTests.cmake  | 32 +--------------
 utils/CMakeLists.txt                     |  9 ++++-
 utils/Makefile.am                        | 14 ++++++-
 utils/test/CMakeLists.txt                | 35 ++++++++++++++++
 utils/test/Makefile.am                   | 34 ++++++++++++++++
 utils/test/swmr_check_compat_vfd.c       | 53 +++++++++++++++++++++++++
 33 files changed, 393 insertions(+), 386 deletions(-)
 create mode 100644 config/gnu-warnings/cxx-developer-4.8
 create mode 100644 config/gnu-warnings/no-cxx-developer-4.8
 delete mode 100644 hl/tools/h5watch/swmr_check_compat_vfd.c
 delete mode 100644 test/swmr_check_compat_vfd.c
 create mode 100644 utils/test/CMakeLists.txt
 create mode 100644 utils/test/Makefile.am
 create mode 100644 utils/test/swmr_check_compat_vfd.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13f2e35..3c6df76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1004,10 +1004,7 @@ endif ()
 # Option to build HDF5 Utilities
 #-----------------------------------------------------------------------------
 if (EXISTS "${HDF5_SOURCE_DIR}/utils" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/utils")
-  option (HDF5_BUILD_UTILS  "Build HDF5 Utils" ON)
-  if (HDF5_BUILD_UTILS)
-    add_subdirectory (utils)
-  endif ()
+  add_subdirectory (utils)
 endif ()
 
 #-----------------------------------------------------------------------------
diff --git a/MANIFEST b/MANIFEST
index bd9817f..d8867f6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -173,6 +173,7 @@
 ./config/gnu-warnings/cxx-4.9
 ./config/gnu-warnings/cxx-5
 ./config/gnu-warnings/cxx-9
+./config/gnu-warnings/cxx-developer-4.8
 ./config/gnu-warnings/cxx-error-5
 ./config/gnu-warnings/cxx-error-general
 ./config/gnu-warnings/developer-4.8
@@ -189,6 +190,7 @@
 ./config/gnu-warnings/gfort-5
 ./config/gnu-warnings/gfort-6
 ./config/gnu-warnings/gfort-8
+./config/gnu-warnings/no-cxx-developer-4.8
 ./config/gnu-warnings/no-developer-4.8
 ./config/gnu-warnings/no-developer-8
 ./config/gnu-warnings/no-developer-general
@@ -1301,7 +1303,6 @@
 ./test/stab.c
 ./test/swmr.c
 ./test/swmr_addrem_writer.c
-./test/swmr_check_compat_vfd.c
 ./test/swmr_common.c
 ./test/swmr_common.h
 ./test/swmr_generator.c
@@ -2988,6 +2989,10 @@
 ./utils/mirror_vfd/mirror_server_stop.c
 ./utils/mirror_vfd/mirror_writer.c
 
+# test utilities
+./utils/test/Makefile.am
+./utils/test/swmr_check_compat_vfd.c
+
 # high level libraries
 ./hl/Makefile.am
 ./hl/examples/Makefile.am
@@ -3099,7 +3104,6 @@
 ./hl/tools/h5watch/extend_dset.c
 ./hl/tools/h5watch/h5watch.c
 ./hl/tools/h5watch/h5watchgentest.c
-./hl/tools/h5watch/swmr_check_compat_vfd.c
 ./hl/tools/h5watch/testh5watch.sh.in
 
 # expected test output from testing h5watch
@@ -3724,7 +3728,9 @@
 ./tools/test/misc/vds/CMakeLists.txt
 ./tools/test/perform/CMakeLists.txt
 ./tools/test/perform/CMakeTests.cmake
+
 ./utils/CMakeLists.txt
+./utils/test/CMakeLists.txt
 ./utils/mirror_vfd/CMakeLists.txt
 
 # CMake-specific User Scripts
@@ -3840,3 +3846,4 @@
 ./tools/test/perform/Makefile.in
 ./utils/Makefile.in
 ./utils/mirror_vfd/Makefile.in
+./utils/test/Makefile.in
diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake
index 6a74244..d525bb5 100644
--- a/c++/test/CMakeVFDTests.cmake
+++ b/c++/test/CMakeVFDTests.cmake
@@ -16,37 +16,7 @@
 ##############################################################################
 ##############################################################################
 
-set (VFD_LIST
-    sec2
-    stdio
-    core
-    core_paged
-    split
-    multi
-    family
-    splitter
-    #log - log VFD currently has file space allocation bugs
-)
-
-if (H5_HAVE_DIRECT)
-  set (VFD_LIST ${VFD_LIST} direct)
-endif ()
-if (H5_HAVE_PARALLEL)
-  # MPI I/O VFD is currently incompatible with too many tests in the VFD test set 
-  # set (VFD_LIST ${VFD_LIST} mpio)
-endif ()
-if (H5_HAVE_MIRROR_VFD)
-  set (VFD_LIST ${VFD_LIST} mirror)
-endif ()
-if (H5_HAVE_ROS3_VFD)
-  set (VFD_LIST ${VFD_LIST} ros3)
-endif ()
-if (H5_HAVE_LIBHDFS)
-  set (VFD_LIST ${VFD_LIST} hdfs)
-endif ()
-if (H5_HAVE_WINDOWS)
-  set (VFD_LIST ${VFD_LIST} windows)
-endif ()
+H5_SET_VFD_LIST()
 
 ##############################################################################
 ##############################################################################
@@ -56,7 +26,6 @@ endif ()
 
 macro (ADD_VFD_TEST vfdname resultcode)
   if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}")
     add_test (
         NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects
         COMMAND ${CMAKE_COMMAND} -E remove
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 090524a..b3cf015 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -58,5 +58,42 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage)
       endif ()
     endif ()
   endif ()
+endmacro ()
+
+macro (H5_SET_VFD_LIST)
+  set (VFD_LIST
+      sec2
+      stdio
+      core
+      core_paged
+      split
+      multi
+      family
+      splitter
+      #log - log VFD currently has file space allocation bugs
+  )
+
+  if (H5_HAVE_DIRECT)
+    set (VFD_LIST ${VFD_LIST} direct)
+  endif ()
+  if (H5_HAVE_PARALLEL)
+    # MPI I/O VFD is currently incompatible with too many tests in the VFD test set
+    # set (VFD_LIST ${VFD_LIST} mpio)
+  endif ()
+  if (H5_HAVE_MIRROR_VFD)
+    set (VFD_LIST ${VFD_LIST} mirror)
+  endif ()
+  if (H5_HAVE_ROS3_VFD)
+    set (VFD_LIST ${VFD_LIST} ros3)
+  endif ()
+  if (H5_HAVE_LIBHDFS)
+    set (VFD_LIST ${VFD_LIST} hdfs)
+  endif ()
+  if (H5_HAVE_WINDOWS)
+    set (VFD_LIST ${VFD_LIST} windows)
+  endif ()
 
+  foreach (vfdtest ${VFD_LIST})
+    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
+  endforeach ()
 endmacro ()
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 7bfd0bd..a5af43c 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -181,9 +181,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.8")
     if (HDF5_ENABLE_DEV_WARNINGS)
       # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-developer-4.8")
     else ()
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-cxx-developer-4.8")
     endif ()
   endif ()
 
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index 280679d..56e89bc 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -221,8 +221,8 @@ if test "X-g++" = "X-$cxx_vendor"; then
     if test $cxx_vers_major -ge 5 -o $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 8; then
         H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-4.8)"
         # Use the C warnings as CXX warnings are the same
-        DEVELOPER_WARNING_CXXFLAGS="$DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments developer-4.8)"
-        NO_DEVELOPER_WARNING_CXXFLAGS="$NO_DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments no-developer-4.8)"
+        DEVELOPER_WARNING_CXXFLAGS="$DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments cxx-developer-4.8)"
+        NO_DEVELOPER_WARNING_CXXFLAGS="$NO_DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments no-cxx-developer-4.8)"
     fi
 
     # gcc >= 4.9
diff --git a/config/gnu-warnings/cxx-developer-4.8 b/config/gnu-warnings/cxx-developer-4.8
new file mode 100644
index 0000000..e0d975f
--- /dev/null
+++ b/config/gnu-warnings/cxx-developer-4.8
@@ -0,0 +1,16 @@
+# developer warning flags added for GCC >= 4.5
+#
+# developer warning flag added for GCC >= 4.6
+-Wsuggest-attribute=const
+
+# developer warning flags added for GCC >= 4.7
+-Wsuggest-attribute=noreturn
+-Wsuggest-attribute=pure
+#
+# It's not clear that -Wvector-operation-performance warnings are
+# actionable, so they are demoted to "developer" warnings.
+#
+-Wvector-operation-performance
+
+# developer warning flag added for GCC >= 4.8
+-Wsuggest-attribute=format
diff --git a/config/gnu-warnings/no-cxx-developer-4.8 b/config/gnu-warnings/no-cxx-developer-4.8
new file mode 100644
index 0000000..3c3de93
--- /dev/null
+++ b/config/gnu-warnings/no-cxx-developer-4.8
@@ -0,0 +1,9 @@
+# no-developer warning flag added for GCC >= 4.6
+-Wno-suggest-attribute=const
+
+# no-developer warning flags added for GCC >= 4.7
+-Wno-suggest-attribute=noreturn
+-Wno-suggest-attribute=pure
+
+# no-developer warning flag added for GCC >= 4.8
+-Wno-suggest-attribute=format
diff --git a/configure.ac b/configure.ac
index e5f67d4..7665f8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4001,6 +4001,7 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  testpar/testpflush.sh
                  utils/Makefile
                  utils/mirror_vfd/Makefile
+                 utils/test/Makefile
                  tools/Makefile
                  tools/lib/Makefile
                  tools/libtest/Makefile
diff --git a/hl/tools/h5watch/CMakeLists.txt b/hl/tools/h5watch/CMakeLists.txt
index be983ba..1ab473d 100644
--- a/hl/tools/h5watch/CMakeLists.txt
+++ b/hl/tools/h5watch/CMakeLists.txt
@@ -40,29 +40,6 @@ if (HDF5_ENABLE_FORMATTERS)
 endif ()
 
 if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL)
-  #-- Add swmr_check_compat_vfd program
-  set (hl_swmr_check_compat_vfd_SOURCES
-      ${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/swmr_check_compat_vfd.c
-  )
-  add_executable (hl_swmr_check_compat_vfd ${hl_swmr_check_compat_vfd_SOURCES})
-  target_compile_options(hl_swmr_check_compat_vfd PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-  target_include_directories (hl_swmr_check_compat_vfd PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  if (NOT ONLY_SHARED_LIBS)
-    TARGET_C_PROPERTIES (hl_swmr_check_compat_vfd STATIC)
-    target_link_libraries (hl_swmr_check_compat_vfd PRIVATE ${HDF5_LIB_TARGET})
-  else ()
-    TARGET_C_PROPERTIES (hl_swmr_check_compat_vfd SHARED)
-    target_link_libraries (hl_swmr_check_compat_vfd PRIVATE ${HDF5_LIBSH_TARGET})
-  endif ()
-  set_target_properties (hl_swmr_check_compat_vfd PROPERTIES FOLDER tools/hl)
-
-  #-----------------------------------------------------------------------------
-  # Add Target to clang-format
-  #-----------------------------------------------------------------------------
-  if (HDF5_ENABLE_FORMATTERS)
-    clang_format (HDF5_HL_TOOLS_H5WATCH_hl_swmr_check_compat_vfd_FORMAT hl_swmr_check_compat_vfd)
-  endif ()
-
   #-- Add extend_dset program
   set (extend_dset_SOURCES
       ${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/extend_dset.c
diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake
index 60c099b..b2f689b 100644
--- a/hl/tools/h5watch/CMakeTests.cmake
+++ b/hl/tools/h5watch/CMakeTests.cmake
@@ -149,18 +149,22 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
 
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
-set (SWMR_INCOMPAT ${hl_swmr_check_compat_vfd})
+add_test (
+    NAME H5WATCH-SWMR_INCOMPAT
+    COMMAND swmr_check_compat_vfd
+)
+set_tests_properties (H5WATCH-SWMR_INCOMPAT PROPERTIES FIXTURES_SETUP swmr_vfd_check_compat)
 
-if (NOT SWMR_INCOMPAT)
 # Remove any output file left over from previous test run
-  add_test (
-    NAME H5WATCH-clearall-objects
-    COMMAND ${CMAKE_COMMAND} -E remove WATCH.h5
-  )
-  if (last_test)
-    set_tests_properties (H5WATCH-clearall-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "H5WATCH-clearall-objects")
+add_test (
+  NAME H5WATCH-clearall-objects
+  COMMAND ${CMAKE_COMMAND} -E remove WATCH.h5
+)
+set_tests_properties (H5WATCH-clearall-objects PROPERTIES FIXTURES_REQUIRED swmr_vfd_check_compat)
+if (last_test)
+  set_tests_properties (H5WATCH-clearall-objects PROPERTIES DEPENDS ${last_test})
+endif ()
+set (last_test "H5WATCH-clearall-objects")
 
 #################################################################################################
 #                                               #
@@ -182,32 +186,32 @@ if (NOT SWMR_INCOMPAT)
 #                                               #
 #################################################################################################
 # create the output files to be used.
-  add_test (NAME H5WATCH-h5watchgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5watchgentest>)
-  set_tests_properties (H5WATCH-h5watchgentest PROPERTIES
-      WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
-      DEPENDS "H5WATCH-clearall-objects"
-  )
-  set_tests_properties (H5WATCH-h5watchgentest PROPERTIES FIXTURES_SETUP gen_test_watch)
-  set (last_test "H5WATCH-h5watchgentest")
+add_test (NAME H5WATCH-h5watchgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5watchgentest>)
+set_tests_properties (H5WATCH-h5watchgentest PROPERTIES
+    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+    DEPENDS "H5WATCH-clearall-objects"
+)
+set_tests_properties (H5WATCH-h5watchgentest PROPERTIES FIXTURES_SETUP gen_test_watch)
+set_tests_properties (H5WATCH-h5watchgentest PROPERTIES FIXTURES_REQUIRED swmr_vfd_check_compat)
+set (last_test "H5WATCH-h5watchgentest")
 
 # Test on --help options
-  ADD_H5_TEST (w-help1 0 --help)
+ADD_H5_TEST (w-help1 0 --help)
 #
 # Tests on expected failures
-  ADD_H5_ERR_TEST (w-err-dset1 1 WATCH.h5)
-  ADD_H5_ERR_TEST (w-err-dset2 1 WATCH.h5/group/DSET_CMPD)
-  ADD_H5_ERR_TEST (w-err-dset-none 1 WATCH.h5/DSET_NONE)
-  ADD_H5_ERR_TEST (w-err-dset-nomax 1 WATCH.h5/DSET_NOMAX)
-  ADD_H5_ERR_TEST (w-err-file 1 ../WATCH.h5/DSET_CMPD)
-  ADD_H5_TEST (w-err-width 1 --width=-8 WATCH.h5/DSET_ONE)
-  ADD_H5_TEST (w-err-poll 1 --polling=-8 WATCH.h5/DSET_ONE)
-  ADD_H5_TEST (w-err-poll0 1 --polling=0 WATCH.h5/DSET_ONE)
+ADD_H5_ERR_TEST (w-err-dset1 1 WATCH.h5)
+ADD_H5_ERR_TEST (w-err-dset2 1 WATCH.h5/group/DSET_CMPD)
+ADD_H5_ERR_TEST (w-err-dset-none 1 WATCH.h5/DSET_NONE)
+ADD_H5_ERR_TEST (w-err-dset-nomax 1 WATCH.h5/DSET_NOMAX)
+ADD_H5_ERR_TEST (w-err-file 1 ../WATCH.h5/DSET_CMPD)
+ADD_H5_TEST (w-err-width 1 --width=-8 WATCH.h5/DSET_ONE)
+ADD_H5_TEST (w-err-poll 1 --polling=-8 WATCH.h5/DSET_ONE)
+ADD_H5_TEST (w-err-poll0 1 --polling=0 WATCH.h5/DSET_ONE)
 #
 # Tests on invalid field names via --fields option for a compound typed dataset: DSET_CMPD
-  ADD_H5_ERR_TEST (w-err-cmpd1 1 --fields=fieldx WATCH.h5/DSET_CMPD)
-  ADD_H5_ERR_TEST (w-err-cmpd2 1 --fields=field1,field2. WATCH.h5/DSET_CMPD)
-  ADD_H5_ERR_TEST (w-err-cmpd3 1 --fields=field1,field2, WATCH.h5/DSET_CMPD)
-  ADD_H5_ERR_TEST (w-err-cmpd4 1 --fields=field1,field2.b.k WATCH.h5/DSET_CMPD)
-  ADD_H5_ERR_TEST (w-err-cmpd5 1 --fields=field1 --fields=field2.b.k WATCH.h5/DSET_CMPD)
+ADD_H5_ERR_TEST (w-err-cmpd1 1 --fields=fieldx WATCH.h5/DSET_CMPD)
+ADD_H5_ERR_TEST (w-err-cmpd2 1 --fields=field1,field2. WATCH.h5/DSET_CMPD)
+ADD_H5_ERR_TEST (w-err-cmpd3 1 --fields=field1,field2, WATCH.h5/DSET_CMPD)
+ADD_H5_ERR_TEST (w-err-cmpd4 1 --fields=field1,field2.b.k WATCH.h5/DSET_CMPD)
+ADD_H5_ERR_TEST (w-err-cmpd5 1 --fields=field1 --fields=field2.b.k WATCH.h5/DSET_CMPD)
 #
-endif ()
diff --git a/hl/tools/h5watch/Makefile.am b/hl/tools/h5watch/Makefile.am
index 5112965..13bd820 100644
--- a/hl/tools/h5watch/Makefile.am
+++ b/hl/tools/h5watch/Makefile.am
@@ -24,7 +24,6 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/sr
 # These are our main targets, the tools
 
 bin_PROGRAMS=h5watch
-noinst_PROGRAMS=swmr_check_compat_vfd
 
 # Add h5watch specific linker flags here
 h5watch_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
@@ -38,7 +37,7 @@ if BUILD_TESTS_CONDITIONAL
   TEST_SCRIPT=testh5watch.sh
   check_SCRIPTS=$(TEST_SCRIPT)
   SCRIPT_DEPEND=swmr_check_compat_vfd$(EXEEXT) extend_dset$(EXEEXT) h5watch$(EXEEXT)
-  noinst_PROGRAMS+=h5watchgentest extend_dset
+  noinst_PROGRAMS=h5watchgentest extend_dset
   # Add extend_dset specific preprocessor flags here
   # (add the main test subdirectory to the include file path)
   extend_dset_CPPFLAGS=$(AM_CPPFLAGS) -I$(top_srcdir)/test
diff --git a/hl/tools/h5watch/swmr_check_compat_vfd.c b/hl/tools/h5watch/swmr_check_compat_vfd.c
deleted file mode 100644
index b4021e4..0000000
--- a/hl/tools/h5watch/swmr_check_compat_vfd.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* Purpose:     This is a small program that checks if the HDF5_DRIVER
- *              environment variable is set to a value that supports SWMR.
- *
- *              It is intended for use in shell scripts.
- */
-
-#include <stdlib.h>
-
-#include "H5private.h"
-
-/* This file needs to access the file driver testing code */
-#define H5FD_FRIEND /*suppress error about including H5FDpkg	  */
-#define H5FD_TESTING
-#include "H5FDpkg.h" /* File drivers	 			*/
-
-/*-------------------------------------------------------------------------
- * Function:    main
- *
- * Purpose:     Inspects the HDF5_DRIVER environment variable, which
- *              determines the VFD that the test harness will use with
- *              the majority of the tests.
- *
- * Return:      VFD supports SWMR:          EXIT_SUCCESS
- *
- *              VFD does not support SWMR
- *              or failure:                 EXIT_FAILURE
- *
- *-------------------------------------------------------------------------
- */
-int
-main(void)
-{
-    char *driver = NULL;
-
-    driver = HDgetenv(HDF5_DRIVER);
-
-    if (H5FD__supports_swmr_test(driver))
-        return EXIT_SUCCESS;
-    else
-        return EXIT_FAILURE;
-
-} /* end main() */
diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in
index 67ffcc3..04b6ef8 100644
--- a/hl/tools/h5watch/testh5watch.sh.in
+++ b/hl/tools/h5watch/testh5watch.sh.in
@@ -13,10 +13,16 @@
 #
 # Tests for the h5watch tool
 #
+bindir=@bindir@
+
+# If the bindir directory is not set just use current (.).
+if test -z "$bindir"; then
+   bindir=.
+fi
 
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
-./swmr_check_compat_vfd
+$bindir/swmr_check_compat_vfd
 rc=$?
 if [ $rc != 0 ] ; then
     echo
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 8a2c496..d9a4e8e 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -47,10 +47,18 @@ New Features
 
     Configuration:
     -------------
+    - Refactored the utils folder.
+
+      Added subfolder test and moved the 'swmr_check_compat_vfd.c file'
+      from test into utils/test. Deleted the duplicate swmr_check_compat_vfd.c
+      file in hl/tools/h5watch folder. Also fixed vfd check options.
+
+      (ADB - 2021/10/18)
+
     - Changed autotools and CMake configurations to derive both
       compilation warnings-as-errors and warnings-only-warn configurations
-      from the same files, `config/*/*error*`.  Removed redundant files
-      `config/*/*noerror*`.
+      from the same files, 'config/*/*error*'.  Removed redundant files
+      'config/*/*noerror*'.
 
       (DCY - 2021/09/29)
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1461101..37e6af6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -357,7 +357,7 @@ set (H5_TESTS
     ros3
     s3comms
     hdfs
-    mirror_vfd
+    #mirror_vfd # multiple source
     ntypes
     dangle
     dtransform
@@ -378,6 +378,9 @@ set (H5_TESTS
     cmpd_dtransform
     event_set
 )
+if (HDF5_BUILD_UTILS)
+  set (H5_TESTS ${H5_TESTS} mirror_vfd)
+endif ()
 
 macro (ADD_H5_EXE file)
   add_executable (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
@@ -552,30 +555,25 @@ if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TEST_thread_id_FORMAT thread_id)
 endif ()
 
+if (HDF5_BUILD_UTILS)
 #-- Adding test for mirror_vfd
 add_executable (mirror_vfd ${mirror_vfd_SOURCES})
-target_include_directories (mirror_vfd PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-if (NOT BUILD_SHARED_LIBS)
-  TARGET_C_PROPERTIES (mirror_vfd STATIC)
-  target_link_libraries (mirror_vfd PRIVATE ${HDF5_TEST_LIB_TARGET})
-else ()
-  TARGET_C_PROPERTIES (mirror_vfd SHARED)
-  target_link_libraries (mirror_vfd PRIVATE ${HDF5_TEST_LIBSH_TARGET})
-endif ()
-set_target_properties (mirror_vfd PROPERTIES FOLDER test)
-
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
-if (HDF5_ENABLE_FORMATTERS)
-  clang_format (HDF5_TEST_mirror_vfd_FORMAT mirror_vfd)
-endif ()
+  target_include_directories (mirror_vfd PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (mirror_vfd STATIC)
+    target_link_libraries (mirror_vfd PRIVATE ${HDF5_TEST_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (mirror_vfd SHARED)
+    target_link_libraries (mirror_vfd PRIVATE ${HDF5_TEST_LIBSH_TARGET})
+  endif ()
+  set_target_properties (mirror_vfd PROPERTIES FOLDER test)
 
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
-if (HDF5_ENABLE_FORMATTERS)
-  clang_format (HDF5_TEST_event_set_FORMAT event_set)
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_TEST_mirror_vfd_FORMAT mirror_vfd)
+  endif ()
 endif ()
 
 ##############################################################################
@@ -617,7 +615,6 @@ endif ()
 
 set (H5_SWMR_TESTS
     swmr_addrem_writer
-    swmr_check_compat_vfd
     swmr_generator
     swmr_reader
     swmr_remove_reader
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index c537f37..b2ed8e8 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -879,8 +879,6 @@ if (ENABLE_EXTENDED_TESTS)
 #       testswmr.sh: swmr*
 #       testvdsswmr.sh: vds_swmr*
 
-#  add_test (NAME H5Test-swmr_check_compat_vfd COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:swmr_check_compat_vfd>)
-
 #-- Adding test for flushrefresh
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/flushrefresh_test")
   if (H5_PERL_FOUND)
diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index 723595b..e557676 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -17,40 +17,9 @@
 ##############################################################################
 # included from CMakeTests.cmake
 
-set (VFD_LIST
-    sec2
-    stdio
-    core
-    core_paged
-    split
-    multi
-    family
-    splitter
-    #log - log VFD currently has file space allocation bugs
-)
-
-if (H5_HAVE_DIRECT)
-  set (VFD_LIST ${VFD_LIST} direct)
-endif ()
-if (H5_HAVE_PARALLEL)
-  # MPI I/O VFD is currently incompatible with too many tests in the VFD test set
-  # set (VFD_LIST ${VFD_LIST} mpio)
-endif ()
-if (H5_HAVE_MIRROR_VFD)
-  set (VFD_LIST ${VFD_LIST} mirror)
-endif ()
-if (H5_HAVE_ROS3_VFD)
-  set (VFD_LIST ${VFD_LIST} ros3)
-endif ()
-if (H5_HAVE_LIBHDFS)
-  set (VFD_LIST ${VFD_LIST} hdfs)
-endif ()
-if (H5_HAVE_WINDOWS)
-  set (VFD_LIST ${VFD_LIST} windows)
-endif ()
+H5_SET_VFD_LIST()
 
 foreach (vfdtest ${VFD_LIST})
-  file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles")
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files")
 endforeach ()
diff --git a/test/Makefile.am b/test/Makefile.am
index 09277b0..ff09003 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -36,8 +36,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src
 #       test_mirror.sh: mirror_vfd ../utils/mirror_vfd/*
 #       test_usecases.sh: use_append_chunk, use_append_mchunks, use_disable_mdc_flushes
 TEST_SCRIPT = testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh testexternal_env.sh \
-    testswmr.sh testvds_env.sh testvdsswmr.sh testflushrefresh.sh test_usecases.sh testabort_fail.sh \
-    test_mirror.sh
+    testswmr.sh testvds_env.sh testvdsswmr.sh testflushrefresh.sh test_usecases.sh testabort_fail.sh
 SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) links_env$(EXEEXT) \
     external_env$(EXEEXT) filenotclosed$(EXEEXT) del_many_dense_attrs$(EXEEXT) \
     flushrefresh$(EXEEXT) use_append_chunk$(EXEEXT) use_append_mchunks$(EXEEXT) use_disable_mdc_flushes$(EXEEXT) \
@@ -50,6 +49,10 @@ if HAVE_SHARED_CONDITIONAL
   SCRIPT_DEPEND += filter_plugin$(EXEEXT) vol_plugin$(EXEEXT)
 endif
 
+if MIRROR_VFD_CONDITIONAL
+  TEST_SCRIPT += test_mirror.sh
+endif
+
 check_SCRIPTS = $(TEST_SCRIPT)
 
 # These are our main targets. They should be listed in the order to be
@@ -91,12 +94,15 @@ check_PROGRAMS=$(TEST_PROG) error_test err_compat tcheck_version \
     use_append_chunk use_append_chunk_mirror use_append_mchunks use_disable_mdc_flushes \
     swmr_generator swmr_start_write swmr_reader swmr_writer swmr_remove_reader \
     swmr_remove_writer swmr_addrem_writer swmr_sparse_reader swmr_sparse_writer \
-    swmr_check_compat_vfd vds_env vds_swmr_gen vds_swmr_reader vds_swmr_writer \
-    mirror_vfd
+    vds_env vds_swmr_gen vds_swmr_reader vds_swmr_writer
 if HAVE_SHARED_CONDITIONAL
   check_PROGRAMS+= filter_plugin vfd_plugin vol_plugin
 endif
 
+if MIRROR_VFD_CONDITIONAL
+  check_PROGRAMS+= mirror_vfd
+endif
+
 # These programs generate test files for the tests.  They don't need to be
 # compiled every time we want to test the library.  However, putting
 # them in a conditional causes automake to generate rules so that they
diff --git a/test/ShellTests.cmake b/test/ShellTests.cmake
index 9614152..732091b 100644
--- a/test/ShellTests.cmake
+++ b/test/ShellTests.cmake
@@ -21,6 +21,7 @@ if (UNIX)
   if (SH_PROGRAM)
     set (srcdir ${HDF5_TEST_SOURCE_DIR})
     set (bindir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+    set (testdir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
     ##############################################################################
     #  configure scripts to test dir
     ##############################################################################
@@ -37,7 +38,7 @@ if (UNIX)
     #shell script creates dir
     #file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/swmr_test")
     add_custom_command (
-        TARGET     swmr_check_compat_vfd
+        TARGET     accum_swmr_reader
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
         ARGS       -E copy_if_different "${HDF5_SOURCE_DIR}/bin/output_filter.sh" "${HDF5_TEST_BINARY_DIR}/H5TEST/bin/output_filter.sh"
@@ -46,9 +47,11 @@ if (UNIX)
     #shell script creates dir
     #file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/usecases_test")
 
-    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/swmr_test")
+    #shell script creates dir
+    #file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/swmr_test")
 
-    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/vds_swmr_test")
+    #shell script creates dir
+    #file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/vds_swmr_test")
 
     ##############################################################################
     ##############################################################################
diff --git a/test/swmr_check_compat_vfd.c b/test/swmr_check_compat_vfd.c
deleted file mode 100644
index 720c747..0000000
--- a/test/swmr_check_compat_vfd.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* Purpose:     This is a small program that checks if the HDF5_DRIVER
- *              environment variable is set to a value that supports SWMR.
- *
- *              It is intended for use in shell scripts.
- */
-
-#include "h5test.h"
-
-/* This file needs to access the file driver testing code */
-#define H5FD_FRIEND /*suppress error about including H5FDpkg            */
-#define H5FD_TESTING
-#include "H5FDpkg.h" /* File drivers                                     */
-
-/*-------------------------------------------------------------------------
- * Function:    main
- *
- * Purpose:     Inspects the HDF5_DRIVER environment variable, which
- *              determines the VFD that the test harness will use with
- *              the majority of the tests.
- *
- * Return:      VFD supports SWMR:          EXIT_SUCCESS
- *
- *              VFD does not support SWMR
- *              or failure:                 EXIT_FAILURE
- *
- *-------------------------------------------------------------------------
- */
-int
-main(void)
-{
-    char *driver = NULL;
-
-    driver = HDgetenv(HDF5_DRIVER);
-
-    if (H5FD__supports_swmr_test(driver))
-        return EXIT_SUCCESS;
-    else
-        return EXIT_FAILURE;
-
-} /* end main() */
diff --git a/test/test_usecases.sh.in b/test/test_usecases.sh.in
index eaa875e..3f7d5f1 100644
--- a/test/test_usecases.sh.in
+++ b/test/test_usecases.sh.in
@@ -21,14 +21,38 @@
 # For now, it shows how to run the test cases programs. It only verifies the
 # exit codes are okay (0).
 
+###############################################################################
+## test variables
+###############################################################################
+
+# Number of errors encountered during test run.
+nerrors=0
+
+# Define variables
+verbose=yes
+
+###############################################################################
+## Main
+###############################################################################
 srcdir=@srcdir@
 bindir=@bindir@
+testdir=@testdir@
+
+# The build (current) directory might be different than the source directory.
+if test -z "$srcdir"; then
+   srcdir=.
+fi
 
 # If the bindir directory is not set just use current (.).
 if test -z "$bindir"; then
    bindir=.
 fi
 
+# If the testdir directory is not set just use current (.).
+if test -z "$testdir"; then
+   testdir=.
+fi
+
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
 $bindir/swmr_check_compat_vfd
@@ -53,10 +77,6 @@ RESULT_SKIP="-SKIP-"
 USECASES_PROGRAMS="use_append_chunk use_append_mchunks"
 TESTNAME="Use Case"
 
-# Define variables
-nerrors=0
-verbose=yes
-
 # Source in the output filter function definitions.
 . $srcdir/../bin/output_filter.sh
 
@@ -91,7 +111,7 @@ TOOLTEST() {
     # Run test.
     TESTING $program $@
     (
-      $RUNSERIAL $bindir/$program "$@"
+      $RUNSERIAL $testdir/$program "$@"
     ) >$actual 2>$actual_err
     exit_code=$?
 
@@ -123,7 +143,7 @@ TOOLTEST() {
 # the test.  Running each of these tests in its own directory should eliminate
 # the problem.
 mkdir usecases_test
-cp twriteorder usecases_test
+cp $bindir/twriteorder usecases_test
 for FILE in use_*; do
     case "$FILE" in
         *.o) continue ;;    ## don't copy the .o files
diff --git a/test/testflushrefresh.sh.in b/test/testflushrefresh.sh.in
index 83685e8..3c7f13d 100644
--- a/test/testflushrefresh.sh.in
+++ b/test/testflushrefresh.sh.in
@@ -58,14 +58,28 @@ fi
 ###############################################################################
 ## Main
 ###############################################################################
+srcdir=@srcdir@
+bindir=@bindir@
+testdir=@testdir@
+
 # The build (current) directory might be different than the source directory.
 if test -z "$srcdir"; then
    srcdir=.
 fi
 
+# If the bindir directory is not set just use current (.).
+if test -z "$bindir"; then
+   bindir=.
+fi
+
+# If the testdir directory is not set just use current (.).
+if test -z "$testdir"; then
+   testdir=.
+fi
+
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
-./swmr_check_compat_vfd
+$bindir/swmr_check_compat_vfd
 rc=$?
 if [ $rc -ne 0 ] ; then
     echo
@@ -83,7 +97,7 @@ fi
 # the test.  Running each of these tests in its own directory should eliminate
 # the problem.
 mkdir -p flushrefresh_test
-cp flushrefresh flushrefresh_test
+cp $bindir/flushrefresh flushrefresh_test
 
 # With the --disable-shared option, flushrefresh is built in the test directory,
 # otherwise it is in test/.libs with a wrapper script named flushrefresh in
@@ -118,7 +132,7 @@ fi
 # ========================
 # Launch the Test Program.
 # ========================
-./flushrefresh &
+$testdir/flushrefresh &
 pid_main=$!
 
 # =======================================
@@ -155,7 +169,7 @@ until [ $verification_done -eq 1 ]; do
     verification_done=1
     echo "all flush verification complete" > $endsignal
   else
-    ./flushrefresh $param1 $param2
+    $testdir/flushrefresh $param1 $param2
 
     # Check for core dump
     if [ $? -gt 0 ]; then
@@ -200,7 +214,7 @@ if [ $timedout -eq 0 ]; then
       verification_done=2
       echo "all refresh verification complete" > $endsignal
     else
-      ./flushrefresh $param1
+      $testdir/flushrefresh $param1
 
       # Check for core dump
       if [ $? -gt 0 ]; then
diff --git a/test/testswmr.sh.in b/test/testswmr.sh.in
index 37e8f9c..cb60fce 100644
--- a/test/testswmr.sh.in
+++ b/test/testswmr.sh.in
@@ -18,6 +18,7 @@
 
 srcdir=@srcdir@
 bindir=@bindir@
+testdir=@testdir@
 
 ###############################################################################
 ## test parameters
@@ -103,6 +104,11 @@ if test -z "$bindir"; then
    bindir=.
 fi
 
+# If the testdir directory is not set just use current (.).
+if test -z "$testdir"; then
+   testdir=.
+fi
+
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
 $bindir/swmr_check_compat_vfd
@@ -178,7 +184,7 @@ do
         echo "###############################################################################"
         # Launch the Generator without SWMR_WRITE
         echo launch the swmr_generator
-        $bindir/swmr_generator $compress $index_type
+        $testdir/swmr_generator $compress $index_type
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -186,7 +192,7 @@ do
 
         # Launch the Generator with SWMR_WRITE
         echo launch the swmr_generator with SWMR_WRITE
-        $bindir/swmr_generator -s $compress $index_type
+        $testdir/swmr_generator -s $compress $index_type
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -210,7 +216,7 @@ do
         # Launch the Writer
         echo launch the swmr_start_writer
         seed="" # Put -r <random seed> command here
-        $bindir/swmr_start_write $compress $index_type $Nrecords $seed 2>&1 |tee swmr_writer.out &
+        $testdir/swmr_start_write $compress $index_type $Nrecords $seed 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -226,7 +232,7 @@ do
         while [ $n -lt $Nreaders ]; do
             #seed="-r ${seeds[$n]}"
             seed=""
-            $bindir/swmr_reader $Nsecs_add $seed 2>&1 |tee swmr_reader.out.$n &
+            $testdir/swmr_reader $Nsecs_add $seed 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
@@ -271,7 +277,7 @@ do
 
         # Launch the Generator
         echo launch the swmr_generator
-        $bindir/swmr_generator -s $compress $index_type
+        $testdir/swmr_generator -s $compress $index_type
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -283,7 +289,7 @@ do
         # Launch the Writer
         echo launch the swmr_writer
         seed="" # Put -r <random seed> command here
-        $bindir/swmr_writer -o $Nrecords $seed 2>&1 |tee swmr_writer.out &
+        $testdir/swmr_writer -o $Nrecords $seed 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -298,7 +304,7 @@ do
         while [ $n -lt $Nreaders ]; do
             #seed="-r ${seeds[$n]}"
             seed=""
-            $bindir/swmr_reader $Nsecs_add $seed 2>&1 |tee swmr_reader.out.$n &
+            $testdir/swmr_reader $Nsecs_add $seed 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
@@ -346,7 +352,7 @@ do
         # Launch the Remove Writer
         echo launch the swmr_remove_writer
         seed="" # Put -r <random seed> command here
-        $bindir/swmr_remove_writer -o $Nrecs_rem $seed 2>&1 |tee swmr_writer.out &
+        $testdir/swmr_remove_writer -o $Nrecs_rem $seed 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -361,7 +367,7 @@ do
         while [ $n -lt $Nreaders ]; do
             #seed="-r ${seeds[$n]}"
             seed=""
-            $bindir/swmr_remove_reader $Nsecs_rem $seed 2>&1 |tee swmr_reader.out.$n &
+            $testdir/swmr_remove_reader $Nsecs_rem $seed 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
@@ -406,7 +412,7 @@ do
 
         # Launch the Generator
         echo launch the swmr_generator
-        $bindir/swmr_generator $compress $index_type
+        $testdir/swmr_generator $compress $index_type
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -415,7 +421,7 @@ do
         # Launch the Writer (not in parallel - just to rebuild the datasets)
         echo launch the swmr_writer
         seed="" # Put -r <random seed> command here
-        $bindir/swmr_writer $Nrecords $seed
+        $testdir/swmr_writer $Nrecords $seed
         if test $? -ne 0; then
             echo writer had error
             nerrors=`expr $nerrors + 1`
@@ -427,7 +433,7 @@ do
         # Launch the Add/Remove Writer
         echo launch the swmr_addrem_writer
         seed="" # Put -r <random seed> command here
-        $bindir/swmr_addrem_writer $Nrecords $seed 2>&1 |tee swmr_writer.out &
+        $testdir/swmr_addrem_writer $Nrecords $seed 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -442,7 +448,7 @@ do
         while [ $n -lt $Nreaders ]; do
             #seed="-r ${seeds[$n]}"
             seed=""
-            $bindir/swmr_remove_reader $Nsecs_addrem $seed 2>&1 |tee swmr_reader.out.$n &
+            $testdir/swmr_remove_reader $Nsecs_addrem $seed 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
@@ -490,7 +496,7 @@ do
         #       created by the generator.
         echo launch the swmr_generator
         seed="" # Put -r <random seed> command here
-        $bindir/swmr_generator $compress $index_type $seed
+        $testdir/swmr_generator $compress $index_type $seed
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -500,7 +506,7 @@ do
         rm -f $WRITER_MESSAGE
         # Launch the Sparse writer
         echo launch the swmr_sparse_writer
-        nice -n 20 $bindir/swmr_sparse_writer $Nrecs_spa 2>&1 |tee swmr_writer.out &
+        nice -n 20 $testdir/swmr_sparse_writer $Nrecs_spa 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -513,7 +519,7 @@ do
         echo launch $Nrdrs_spa swmr_sparse_readers
         while [ $n -lt $Nrdrs_spa ]; do
             # The sparse reader spits out a LOT of data so it's set to 'quiet'
-            $bindir/swmr_sparse_reader -q $Nrecs_spa 2>&1 |tee swmr_reader.out.$n &
+            $testdir/swmr_sparse_reader -q $Nrecs_spa 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
diff --git a/test/testvdsswmr.sh.in b/test/testvdsswmr.sh.in
index 5399903..c57cc08 100644
--- a/test/testvdsswmr.sh.in
+++ b/test/testvdsswmr.sh.in
@@ -18,6 +18,7 @@
 
 srcdir=@srcdir@
 bindir=@bindir@
+testdir=@testdir@
 
 ###############################################################################
 ## test parameters
@@ -89,6 +90,11 @@ if test -z "$bindir"; then
    bindir=.
 fi
 
+# If the testdir directory is not set just use current (.).
+if test -z "$testdir"; then
+   testdir=.
+fi
+
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
 $bindir/swmr_check_compat_vfd
@@ -154,7 +160,7 @@ echo "##########################################################################
 
 # Launch the file generator
 echo launch the generator
-$bindir/vds_swmr_gen
+$testdir/vds_swmr_gen
 if test $? -ne 0; then
     echo generator had error
     nerrors=`expr $nerrors + 1`
@@ -172,7 +178,7 @@ echo "launch the $Nwriters SWMR VDS writers (1 per source)"
 pid_writers=""
 n=0
 while [ $n -lt $Nwriters ]; do
-    $bindir/vds_swmr_writer $n &
+    $testdir/vds_swmr_writer $n &
     pid_writers="$pid_writers $!"
     n=`expr $n + 1`
 done
@@ -187,7 +193,7 @@ echo launch $Nreaders SWMR readers
 pid_readers=""
 n=0
 while [ $n -lt $Nreaders ]; do
-    $bindir/vds_swmr_reader &
+    $testdir/vds_swmr_reader &
     pid_readers="$pid_readers $!"
     n=`expr $n + 1`
 done
diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake
index 785c08d..4cda27b 100644
--- a/testpar/CMakeVFDTests.cmake
+++ b/testpar/CMakeVFDTests.cmake
@@ -15,45 +15,13 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
-set (VFD_LIST
-    sec2
-    stdio
-    core
-    core_paged
-    split
-    multi
-    family
-    splitter
-    #log - log VFD currently has file space allocation bugs
-)
 
 set (H5P_VFD_TESTS
     t_pflush1
     t_pflush2
 )
 
-if (H5_HAVE_DIRECT)
-  set (VFD_LIST ${VFD_LIST} direct)
-endif ()
-if (H5_HAVE_PARALLEL)
-  set (VFD_LIST ${VFD_LIST} mpio)
-endif ()
-if (H5_HAVE_MIRROR_VFD)
-  set (VFD_LIST ${VFD_LIST} mirror)
-endif ()
-if (H5_HAVE_ROS3_VFD)
-  set (VFD_LIST ${VFD_LIST} ros3)
-endif ()
-if (H5_HAVE_LIBHDFS)
-  set (VFD_LIST ${VFD_LIST} hdfs)
-endif ()
-if (H5_HAVE_WINDOWS)
-  set (VFD_LIST ${VFD_LIST} windows)
-endif ()
-
-foreach (vfdtest ${VFD_LIST})
-  file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
-endforeach ()
+H5_SET_VFD_LIST()
 
 macro (ADD_VFD_TEST vfdname resultcode)
   if (NOT HDF5_ENABLE_USING_MEMCHECKER)
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index 01834b3..6a70b85 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -16,19 +16,7 @@
 ##############################################################################
 ##############################################################################
 
-set (VFD_H5DUMP_LIST
-    sec2
-    stdio
-    core
-    core_paged
-    split
-    multi
-    family
-)
-
-if (H5_HAVE_DIRECT)
-  set (VFD_H5DUMP_LIST ${VFD_H5DUMP_LIST} direct)
-endif ()
+H5_SET_VFD_LIST()
 
 # --------------------------------------------------------------------
 # Copy all the HDF5 files from the source directory into the test directory
@@ -37,8 +25,7 @@ set (HDF5_VFD_H5DUMP_FILES
   packedbits
 )
 
-foreach (vfdtest ${VFD_H5DUMP_LIST})
-  file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}")
+foreach (vfdtest ${VFD_LIST})
   foreach (h5_tfile ${HDF5_VFD_H5DUMP_FILES})
     HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files")
     HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files")
@@ -79,7 +66,7 @@ endmacro ()
 ##############################################################################
 
 # Run test with different Virtual File Driver
-foreach (vfd ${VFD_H5DUMP_LIST})
+foreach (vfd ${VFD_LIST})
   # test for signed/unsigned datasets
   ADD_VFD_H5DUMP_TEST (${vfd} packedbits 0 --enable-error-stack packedbits.h5)
 endforeach ()
diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake
index 4f6e51d..78d752c 100644
--- a/tools/test/h5repack/CMakeVFDTests.cmake
+++ b/tools/test/h5repack/CMakeVFDTests.cmake
@@ -16,36 +16,7 @@
 ##############################################################################
 ##############################################################################
 
-set (VFD_LIST
-    sec2
-    stdio
-    core
-    core_paged
-    split
-    multi
-    family
-    splitter
-    #log - log VFD currently has file space allocation bugs
-)
-
-if (H5_HAVE_DIRECT)
-  set (VFD_LIST ${VFD_LIST} direct)
-endif ()
-if (H5_HAVE_PARALLEL)
-  set (VFD_LIST ${VFD_LIST} mpio)
-endif ()
-if (H5_HAVE_MIRROR_VFD)
-  set (VFD_LIST ${VFD_LIST} mirror)
-endif ()
-if (H5_HAVE_ROS3_VFD)
-  set (VFD_LIST ${VFD_LIST} ros3)
-endif ()
-if (H5_HAVE_LIBHDFS)
-  set (VFD_LIST ${VFD_LIST} hdfs)
-endif ()
-if (H5_HAVE_WINDOWS)
-  set (VFD_LIST ${VFD_LIST} windows)
-endif ()
+H5_SET_VFD_LIST()
 
 ##############################################################################
 ##############################################################################
@@ -55,7 +26,6 @@ endif ()
 
 macro (ADD_VFD_TEST vfdname resultcode)
   if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}")
     add_test (
         NAME H5REPACK-${vfdname}-h5repacktest-clear-objects
         COMMAND ${CMAKE_COMMAND} -E remove
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 2d5626e..7c263d1 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,4 +1,11 @@
 cmake_minimum_required (VERSION 3.10)
 project (HDF5_UTILS C)
 
-add_subdirectory (mirror_vfd)
+if (BUILD_TESTING)
+  add_subdirectory (test)
+endif ()
+
+option (HDF5_BUILD_UTILS  "Build HDF5 Utils" ON)
+if (HDF5_BUILD_UTILS)
+  add_subdirectory (mirror_vfd)
+endif ()
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 288da37..876dfb1 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -20,7 +20,19 @@ include $(top_srcdir)/config/commence.am
 
 CONFIG=ordered
 
+if BUILD_TESTS_CONDITIONAL
+   TESTUTIL_DIR =test
+else
+   TESTUTIL_DIR=
+endif
+
+if MIRROR_VFD_CONDITIONAL
+   MIRROR_VFD_DIR = mirror_vfd
+else
+   MIRROR_VFD_DIR=
+endif
+
 # All subdirectories
-SUBDIRS=mirror_vfd
+SUBDIRS=$(MIRROR_VFD_DIR) $(TESTUTIL_DIR)
 
 include $(top_srcdir)/config/conclude.am
diff --git a/utils/test/CMakeLists.txt b/utils/test/CMakeLists.txt
new file mode 100644
index 0000000..921fbd0
--- /dev/null
+++ b/utils/test/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required (VERSION 3.12)
+project (HDF5_TEST C)
+
+#################################################################################
+#  Test program sources
+#################################################################################
+
+macro (ADD_H5_EXE file)
+  add_executable (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
+  target_include_directories (${file} PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_compile_options(${file} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (${file} STATIC)
+    target_link_libraries (${file} PRIVATE ${HDF5_TEST_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (${file} SHARED)
+    target_link_libraries (${file} PRIVATE ${HDF5_TEST_LIBSH_TARGET})
+  endif ()
+  set_target_properties (${file} PROPERTIES FOLDER test)
+endmacro ()
+
+##############################################################################
+###                S W I M M E R   T E S T  U T I L S                      ###
+##############################################################################
+set (H5_UTIL_TESTS)
+
+if (HDF5_TEST_SWMR)
+  set (H5_UTIL_TESTS ${H5_UTIL_TESTS} swmr_check_compat_vfd)
+endif ()
+
+if (H5_UTIL_TESTS)
+  foreach (h5_test ${H5_UTIL_TESTS})
+    ADD_H5_EXE(${h5_test})
+  endforeach ()
+endif ()
diff --git a/utils/test/Makefile.am b/utils/test/Makefile.am
new file mode 100644
index 0000000..164562f
--- /dev/null
+++ b/utils/test/Makefile.am
@@ -0,0 +1,34 @@
+#
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+##
+## Makefile.am
+## Run automake to generate a Makefile.in from this file.
+#
+# HDF5 Library Makefile(.in)
+#
+
+include $(top_srcdir)/config/commence.am
+
+# Include src and tools/lib directories
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib -I$(top_srcdir)/utils/test
+
+# These are our main targets, the tools
+
+noinst_PROGRAMS=swmr_check_compat_vfd
+
+# Programs all depend on the hdf5 library, the tools library, and the HL
+# library.
+LDADD=$(LIBH5TEST) $(LIBHDF5)
+
+CHECK_CLEANFILES+=*.h5
+
+include $(top_srcdir)/config/conclude.am
diff --git a/utils/test/swmr_check_compat_vfd.c b/utils/test/swmr_check_compat_vfd.c
new file mode 100644
index 0000000..720c747
--- /dev/null
+++ b/utils/test/swmr_check_compat_vfd.c
@@ -0,0 +1,53 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Purpose:     This is a small program that checks if the HDF5_DRIVER
+ *              environment variable is set to a value that supports SWMR.
+ *
+ *              It is intended for use in shell scripts.
+ */
+
+#include "h5test.h"
+
+/* This file needs to access the file driver testing code */
+#define H5FD_FRIEND /*suppress error about including H5FDpkg            */
+#define H5FD_TESTING
+#include "H5FDpkg.h" /* File drivers                                     */
+
+/*-------------------------------------------------------------------------
+ * Function:    main
+ *
+ * Purpose:     Inspects the HDF5_DRIVER environment variable, which
+ *              determines the VFD that the test harness will use with
+ *              the majority of the tests.
+ *
+ * Return:      VFD supports SWMR:          EXIT_SUCCESS
+ *
+ *              VFD does not support SWMR
+ *              or failure:                 EXIT_FAILURE
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+    char *driver = NULL;
+
+    driver = HDgetenv(HDF5_DRIVER);
+
+    if (H5FD__supports_swmr_test(driver))
+        return EXIT_SUCCESS;
+    else
+        return EXIT_FAILURE;
+
+} /* end main() */
-- 
cgit v0.12


From e1c4209f9f179dcb72eae5e93166c2a6acd897c8 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Wed, 20 Oct 2021 12:17:37 -0500
Subject: Fixed HL_test_packet, incorrect length assignment (#1100)

---
 hl/test/test_packet_vlen.c | 4 ++--
 release_docs/RELEASE.txt   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hl/test/test_packet_vlen.c b/hl/test/test_packet_vlen.c
index c668a07..6d6bf34 100644
--- a/hl/test/test_packet_vlen.c
+++ b/hl/test/test_packet_vlen.c
@@ -539,8 +539,8 @@ test_VLof_VLtype(void)
                 HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
                 goto error;
             }
-            t1->len = vv * 1;
-            for (ww = 0; ww < (vv * 1); ww++)
+            t1->len = vv + 1;
+            for (ww = 0; ww < (vv + 1); ww++)
                 ((unsigned int *)t1->p)[ww] = uu * 100 + vv * 10 + ww;
         } /* end for */
     }     /* end for */
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index d9a4e8e..09e0a95 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1447,7 +1447,11 @@ Bug Fixes since HDF5-1.12.0 release
 
     High-Level Library
     ------------------
-    -
+    - Fixed HL_test_packet, test for packet table vlen of vlen.
+
+      Incorrect length assignment.
+
+        (ADB - 2021/10/14)
 
 
     Fortran High-Level APIs
-- 
cgit v0.12


From 76c77a242cd1b092b5d176057b0d4000bebffd13 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Wed, 20 Oct 2021 13:54:41 -0500
Subject: Correct java exception declarations (#1121)

---
 java/src/hdf/hdf5lib/H5.java | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 63547df..cfff680 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -12776,8 +12776,11 @@ public class H5 implements java.io.Serializable {
      *            IN: Field name of the field index to retrieve.
      *
      * @return if field is defined, the index; else negative.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native int H5Tget_member_index(long type_id, String field_name);
+    public synchronized static native int H5Tget_member_index(long type_id, String field_name) throws HDF5LibraryException;
 
     /**
      * H5Tget_member_name retrieves the name of a field of a compound datatype or an element of an enumeration datatype.
@@ -12788,8 +12791,11 @@ public class H5 implements java.io.Serializable {
      *            IN: Field index (0-based) of the field name to retrieve.
      *
      * @return a valid pointer to the name if successful; otherwise null.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native String H5Tget_member_name(long type_id, int field_idx);
+    public synchronized static native String H5Tget_member_name(long type_id, int field_idx) throws HDF5LibraryException;
 
     /**
      * H5Tget_member_offset returns the byte offset of the specified member of the compound datatype. This is the byte
@@ -12801,11 +12807,8 @@ public class H5 implements java.io.Serializable {
      *            IN: Field index (0-based) of the field type to retrieve.
      *
      * @return the offset of the member.
-     *
-     * @exception HDF5LibraryException
-     *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native long H5Tget_member_offset(long type_id, int membno) throws HDF5LibraryException;
+    public synchronized static native long H5Tget_member_offset(long type_id, int membno);
 
     /**
      * H5Tget_member_type returns the datatype of the specified member.
@@ -13460,7 +13463,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native long H5VLregister_connector_by_name(String connector_name, long vipl_id);
+    public synchronized static native long H5VLregister_connector_by_name(String connector_name, long vipl_id) throws HDF5LibraryException;
     /**
      * H5VLregister_connector_by_value registers a new VOL connector as a member of the virtual object layer class.
      *
@@ -13475,7 +13478,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native long H5VLregister_connector_by_value(int connector_value, long vipl_id);
+    public synchronized static native long H5VLregister_connector_by_value(int connector_value, long vipl_id) throws HDF5LibraryException;
     /**
      * H5VLis_connector_registered_by_name tests whether a VOL class has been registered.
      *
@@ -13487,7 +13490,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native boolean H5VLis_connector_registered_by_name(String name);
+    public synchronized static native boolean H5VLis_connector_registered_by_name(String name) throws HDF5LibraryException;
     /**
      * H5VLis_connector_registered_by_value tests whether a VOL class has been registered.
      *
@@ -13499,7 +13502,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native boolean H5VLis_connector_registered_by_value(int connector_value);
+    public synchronized static native boolean H5VLis_connector_registered_by_value(int connector_value) throws HDF5LibraryException;
     /**
      * H5VLget_connector_id retrieves the ID for a registered VOL connector for a given object.
      *
@@ -13511,7 +13514,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native long H5VLget_connector_id(long object_id);
+    public synchronized static native long H5VLget_connector_id(long object_id) throws HDF5LibraryException;
     /**
      * H5VLget_connector_id_by_name retrieves the ID for a registered VOL connector.
      *
@@ -13523,7 +13526,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native long H5VLget_connector_id_by_name(String name);
+    public synchronized static native long H5VLget_connector_id_by_name(String name) throws HDF5LibraryException;
     /**
      * H5VLget_connector_id_by_value retrieves the ID for a registered VOL connector.
      *
@@ -13535,7 +13538,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native long H5VLget_connector_id_by_value(int connector_value);
+    public synchronized static native long H5VLget_connector_id_by_value(int connector_value) throws HDF5LibraryException;
     /**
      * H5VLget_connector_name returns the connector name for the VOL associated with the
      *              object or file ID.
@@ -13548,7 +13551,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native String H5VLget_connector_name(long object_id);
+    public synchronized static native String H5VLget_connector_name(long object_id) throws HDF5LibraryException;
     /**
      * H5VLclose closes a VOL connector ID.
      *
@@ -13558,7 +13561,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native void H5VLclose(long connector_id);
+    public synchronized static native void H5VLclose(long connector_id) throws HDF5LibraryException;
     /**
      * H5VLunregister_connector removes a VOL connector ID from the library.
      *
@@ -13568,7 +13571,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native void H5VLunregister_connector(long connector_id);
+    public synchronized static native void H5VLunregister_connector(long connector_id) throws HDF5LibraryException;
 
     // /////// unimplemented ////////
     // hid_t H5VLregister_connector(const H5VL_class_t *cls, hid_t vipl_id);
-- 
cgit v0.12


From f9a57500cae57d94444db08f636dea209cbdbf56 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Thu, 21 Oct 2021 16:08:05 -0500
Subject: Add release note for HDFFV-11150 fix. (#1106)

* Add release note for HDFFV-11150 fix.

* Add note about gif tool CVEs.
---
 release_docs/RELEASE.txt | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 09e0a95..f12fbb8 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -66,7 +66,13 @@ New Features
       that default ON/enabled.
 
       Add configure options (autotools - CMake):
-            enable-hltools       HDF5_BUILD_HL_TOOLS
+            --enable-hltools       HDF5_BUILD_HL_TOOLS
+
+      Disabling this option prevents building the gif tool which
+      contains the following CVEs:
+          HDFFV-10592 CVE-2018-17433
+          HDFFV-10593 CVE-2018-17436
+          HDFFV-11048 CVE-2020-10809
 
       (ADB - 2021/09/16, HDFFV-11266)
 
@@ -1100,6 +1106,14 @@ Bug Fixes since HDF5-1.12.0 release
 
         (ADB - 2021/03/03, #361)
 
+    - Fixed a segmentation fault
+
+      A segmentation fault occurred with a Mathworks corrupted file.
+
+      A detection of accessing a null pointer was added to prevent the problem.
+
+      (BMR - 2021/02/19, HDFFV-11150)
+
     - Fixed issue with MPI communicator and info object not being
       copied into new FAPL retrieved from H5F_get_access_plist
 
@@ -1657,3 +1671,11 @@ The share folder will have the most differences because CMake builds include
 a number of CMake specific files for support of CMake's find_package and support
 for the HDF5 Examples CMake project.
 
+The issues with the gif tool are:
+    HDFFV-10592 CVE-2018-17433
+    HDFFV-10593 CVE-2018-17436
+    HDFFV-11048 CVE-2020-10809
+These CVE issues have not yet been addressed and can be avoided by not building
+the gif tool. Disable building the High-Level tools with these options:
+    autotools:   --disable-hltools
+    cmake:       HDF5_BUILD_HL_TOOLS=OFF
-- 
cgit v0.12


From bf395daa6f33dc0dc3e9fc1ae67661c818d5aa7b Mon Sep 17 00:00:00 2001
From: jhendersonHDF <jhenderson@hdfgroup.org>
Date: Thu, 21 Oct 2021 16:08:28 -0500
Subject: Fix map open to use correct VOL argument structure (#1116)

Fix map iterate by setting key memory type ID field
---
 src/H5M.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/H5M.c b/src/H5M.c
index b890a5c..845c054 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -533,7 +533,7 @@ H5M__open_api_common(hid_t loc_id, const char *name, hid_t mapl_id, void **token
     /* Open the map */
     if (H5VL_optional(*vol_obj_ptr, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, token_ptr) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open map")
-    map = map_args.create.map;
+    map = map_args.open.map;
 
     /* Register an ID for the map */
     if ((ret_value = H5VL_register(H5I_MAP, map, (*vol_obj_ptr)->connector, TRUE)) < 0)
@@ -1360,6 +1360,7 @@ H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op,
     map_args.specific.args.iterate.loc_params.type     = H5VL_OBJECT_BY_SELF;
     map_args.specific.args.iterate.loc_params.obj_type = H5I_get_type(map_id);
     map_args.specific.args.iterate.idx                 = (idx ? *idx : 0);
+    map_args.specific.args.iterate.key_mem_type_id     = key_mem_type_id;
     map_args.specific.args.iterate.op                  = op;
     map_args.specific.args.iterate.op_data             = op_data;
     vol_cb_args.op_type                                = H5VL_MAP_SPECIFIC;
@@ -1450,6 +1451,7 @@ H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx, hid_t key_m
     map_args.specific.args.iterate.loc_params.loc_data.loc_by_name.name    = map_name;
     map_args.specific.args.iterate.loc_params.loc_data.loc_by_name.lapl_id = lapl_id;
     map_args.specific.args.iterate.idx                                     = (idx ? *idx : 0);
+    map_args.specific.args.iterate.key_mem_type_id                         = key_mem_type_id;
     map_args.specific.args.iterate.op                                      = op;
     map_args.specific.args.iterate.op_data                                 = op_data;
     vol_cb_args.op_type                                                    = H5VL_MAP_SPECIFIC;
-- 
cgit v0.12


From 4600e10106c330d70a19ae6295f9d04ea7d4adb7 Mon Sep 17 00:00:00 2001
From: "H. Joe Lee" <hyoklee@hdfgroup.org>
Date: Thu, 21 Oct 2021 16:10:07 -0500
Subject: OESS-168: Remove clang warnings. (#1117)

---
 src/H5Pfapl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index f37cb74..70650ec 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -93,7 +93,7 @@
 #define H5F_ACS_DATA_CACHE_BYTE_SIZE_DEC  H5P__decode_size_t
 /* Definition for preemption read chunks first */
 #define H5F_ACS_PREEMPT_READ_CHUNKS_SIZE sizeof(double)
-#define H5F_ACS_PREEMPT_READ_CHUNKS_DEF  0.75f
+#define H5F_ACS_PREEMPT_READ_CHUNKS_DEF  0.75
 #define H5F_ACS_PREEMPT_READ_CHUNKS_ENC  H5P__encode_double
 #define H5F_ACS_PREEMPT_READ_CHUNKS_DEC  H5P__decode_double
 /* Definition for threshold for alignment */
-- 
cgit v0.12


From b0bd984ed620aeca1047f1f45692890eacb924be Mon Sep 17 00:00:00 2001
From: Dana Robinson <43805+derobins@users.noreply.github.com>
Date: Fri, 22 Oct 2021 08:02:28 -0700
Subject: Removes the "try free" behavior from the skip lists (#1126)

* Removes the "try free" behavior from the skip lists

This was only used in the ID code when iterating and a callback
could delete IDs. It is not used anywhere else in the library and
is now pointless overhead.

Also quiets the const warnings when returning stored elements. They
only need to be const with respect to the skip list code, which should
never modify them. The library can do whatever it wants with the elements
it stored.

* Formatted source
---
 src/H5SL.c        | 666 ++++++++++++++++--------------------------------------
 src/H5SLprivate.h |   4 -
 test/tskiplist.c  | 208 -----------------
 3 files changed, 200 insertions(+), 678 deletions(-)

diff --git a/src/H5SL.c b/src/H5SL.c
index ba9721c..b4fbf99 100644
--- a/src/H5SL.c
+++ b/src/H5SL.c
@@ -36,13 +36,6 @@
  *               skip list.  The implementation in that document hurts
  *               performance, at least for integer keys. -NAF)
  *
- *              (Also, this implementation has a couple of home-grown
- *               optimizations, including setting the "update" vector to the
- *               actual 'forward' pointer to update, instead of the node
- *               containing the forward pointer -QAK
- *              -No longer uses update vector, as insertions/deletions are now
- *               always at level 0. -NAF)
- *
  *              (Note: This implementation does not have the information for
  *               implementing the "Linear List Operations" (like insert/delete/
  *               search by position) in section 3.4 of "A Skip List Cookbook",
@@ -71,25 +64,14 @@
 /* Define the code template for searches for the "OP" in the H5SL_LOCATE macro */
 #define H5SL_LOCATE_SEARCH_FOUND(SLIST, X, I)                                                                \
     {                                                                                                        \
-        HDassert(!X->removed);                                                                               \
-        HGOTO_DONE(X->item);                                                                                 \
-    } /* end block */
-
-/* Define the code template for deferred removals for the "OP" in the
- * H5SL_LOCATE macro */
-#define H5SL_LOCATE_SEARCH_DEFER_REMOVE_FOUND(SLIST, X, I)                                                   \
-    {                                                                                                        \
-        HDassert(!X->removed);                                                                               \
-        X->removed = TRUE;                                                                                   \
         HGOTO_DONE(X->item);                                                                                 \
-    } /* end block */
+    }
 
 /* Define the code template for finds for the "OP" in the H5SL_LOCATE macro */
 #define H5SL_LOCATE_FIND_FOUND(SLIST, X, I)                                                                  \
     {                                                                                                        \
-        HDassert(!X->removed);                                                                               \
         HGOTO_DONE(X);                                                                                       \
-    } /* end block */
+    }
 
 /* Define a code template for comparing scalar keys for the "CMP" in the H5SL_LOCATE macro */
 #define H5SL_LOCATE_SCALAR_CMP(SLIST, TYPE, PNODE, PKEY, HASHVAL) (*(TYPE *)((PNODE)->key) < *(TYPE *)PKEY)
@@ -155,51 +137,19 @@
                    H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) {           \
                 X = X->forward[_i];                                                                          \
                 _count++;                                                                                    \
-            } /* end while */                                                                                \
-        }     /* end for */                                                                                  \
+            }                                                                                                \
+        }                                                                                                    \
         X = X->forward[0];                                                                                   \
         if (X != NULL && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, X, KEY, HASHVAL)) {                   \
             /* What to do when a node is found */                                                            \
             H5_GLUE3(H5SL_LOCATE_, OP, _FOUND)(SLIST, X, _i)                                                 \
-        } /* end if */                                                                                       \
-    }
-
-/* Macro used to find node for operation, if there may be "removed" nodes in the
- * list (whose keys cannot be read) */
-#define H5SL_LOCATE_SAFE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                              \
-    {                                                                                                        \
-        int          _i; /* Local index variable */                                                          \
-        H5SL_node_t *_low  = X;                                                                              \
-        H5SL_node_t *_high = NULL;                                                                           \
-                                                                                                             \
-        H5_GLUE3(H5SL_LOCATE_, CMP, _HASHINIT)                                                               \
-        (KEY, HASHVAL) for (_i = (int)SLIST->curr_level; _i >= 0; _i--)                                      \
-        {                                                                                                    \
-            X = _low->forward[_i];                                                                           \
-            while (X != _high) {                                                                             \
-                if (!X->removed) {                                                                           \
-                    if (H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X, KEY, HASHVAL))                     \
-                        _low = X;                                                                            \
-                    else                                                                                     \
-                        break;                                                                               \
-                } /* end if */                                                                               \
-                X = X->forward[_i];                                                                          \
-            } /* end while */                                                                                \
-            _high = X;                                                                                       \
-            if (X != NULL && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, X, KEY, HASHVAL)) {               \
-                /* What to do when a node is found */                                                        \
-                H5_GLUE3(H5SL_LOCATE_, OP, _FOUND)(SLIST, X, _i) break;                                      \
-            } /* end if */                                                                                   \
-        }     /* end for */                                                                                  \
+        }                                                                                                    \
     }
 
 /* Macro used to find node for operation */
 #define H5SL_LOCATE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                                   \
     {                                                                                                        \
-        if ((SLIST)->safe_iterating)                                                                         \
-            H5SL_LOCATE_SAFE(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                          \
-        else                                                                                                 \
-            H5SL_LOCATE_OPT(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                           \
+        H5SL_LOCATE_OPT(OP, CMP, SLIST, X, TYPE, KEY, HASHVAL)                                               \
     }
 
 /* Macro used to grow a node by 1.  Does not update pointers. LVL is the current
@@ -225,13 +175,13 @@
                     if (NULL == (H5SL_fac_g = (H5FL_fac_head_t **)H5MM_realloc(                              \
                                      (void *)H5SL_fac_g, H5SL_fac_nalloc_g * sizeof(H5FL_fac_head_t *))))    \
                         HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, ERR, "memory allocation failed")               \
-                } /* end if */                                                                               \
+                }                                                                                            \
                                                                                                              \
                 /* Create the new factory */                                                                 \
                 H5SL_fac_g[H5SL_fac_nused_g] =                                                               \
                     H5FL_fac_init((1u << H5SL_fac_nused_g) * sizeof(H5SL_node_t *));                         \
                 H5SL_fac_nused_g++;                                                                          \
-            } /* end if */                                                                                   \
+            }                                                                                                \
                                                                                                              \
             /* Allocate space for new forward pointers */                                                    \
             if (NULL == (_tmp = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[X->log_nalloc])))                 \
@@ -239,7 +189,7 @@
             H5MM_memcpy((void *)_tmp, (const void *)X->forward, (LVL + 1) * sizeof(H5SL_node_t *));          \
             X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[X->log_nalloc - 1], (void *)X->forward);   \
             X->forward = _tmp;                                                                               \
-        } /* end if */                                                                                       \
+        }                                                                                                    \
                                                                                                              \
         X->level++;                                                                                          \
     }
@@ -260,7 +210,7 @@
             H5MM_memcpy((void *)_tmp, (const void *)X->forward, (LVL) * sizeof(H5SL_node_t *));              \
             X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[X->log_nalloc + 1], (void *)X->forward);   \
             X->forward = _tmp;                                                                               \
-        } /* end if */                                                                                       \
+        }                                                                                                    \
                                                                                                              \
         X->level--;                                                                                          \
     }
@@ -284,7 +234,7 @@
         else {                                                                                               \
             HDassert(_lvl < (size_t)SLIST->curr_level);                                                      \
             X->forward[_lvl + 1] = PREV->forward[_lvl + 1];                                                  \
-        } /* end else */                                                                                     \
+        }                                                                                                    \
         PREV->forward[_lvl + 1] = X;                                                                         \
     }
 
@@ -322,7 +272,7 @@
                     if (!_drop)                                                                              \
                         _drop = X;                                                                           \
                     break;                                                                                   \
-                } /* end if */                                                                               \
+                }                                                                                            \
                                                                                                              \
                 /* Check if this node is the start of the next gap */                                        \
                 if (!_drop && !H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) \
@@ -337,7 +287,7 @@
                     break;                                                                                   \
                 }                                                                                            \
                 X = X->forward[_i];                                                                          \
-            } /* end for */                                                                                  \
+            }                                                                                                \
             HDassert(!_drop->forward[_i] ||                                                                  \
                      !H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, _drop->forward[_i], KEY, HASHVAL));     \
                                                                                                              \
@@ -350,7 +300,7 @@
             /* Prepare to drop down */                                                                       \
             X = _last = _drop;                                                                               \
             _next     = _drop->forward[_i];                                                                  \
-        } /* end for */                                                                                      \
+        }                                                                                                    \
                                                                                                              \
         if (_next && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, _next, KEY, HASHVAL))                     \
             HGOTO_ERROR(H5E_SLIST, H5E_CANTINSERT, NULL, "can't insert duplicate key")                       \
@@ -359,172 +309,167 @@
 /* Macro used to remove node */
 #define H5SL_REMOVE(CMP, SLIST, X, TYPE, KEY, HASHVAL)                                                       \
     {                                                                                                        \
-        /* Check for deferred removal */                                                                     \
-        if (SLIST->safe_iterating)                                                                           \
-            H5SL_LOCATE(SEARCH_DEFER_REMOVE, CMP, SLIST, X, TYPE, KEY, HASHVAL)                              \
-        else {                                                                                               \
-            H5SL_node_t *_last  = X;             /* Lowest node in the current gap */                        \
-            H5SL_node_t *_llast = X;             /* Lowest node in the previous gap */                       \
-            H5SL_node_t *_next  = NULL;          /* Highest node in the currect gap */                       \
-            H5SL_node_t *_drop  = NULL;          /* Low node of the gap to drop into */                      \
-            H5SL_node_t *_ldrop = NULL;          /* Low node of gap before the one to drop into */           \
-            H5SL_node_t *_head  = SLIST->header; /* Head of the skip list */                                 \
-            int          _count;                 /* Number of nodes in the current gap */                    \
-            int          _i = (int)SLIST->curr_level;                                                        \
+        H5SL_node_t *_last  = X;             /* Lowest node in the current gap */                            \
+        H5SL_node_t *_llast = X;             /* Lowest node in the previous gap */                           \
+        H5SL_node_t *_next  = NULL;          /* Highest node in the currect gap */                           \
+        H5SL_node_t *_drop  = NULL;          /* Low node of the gap to drop into */                          \
+        H5SL_node_t *_ldrop = NULL;          /* Low node of gap before the one to drop into */               \
+        H5SL_node_t *_head  = SLIST->header; /* Head of the skip list */                                     \
+        int          _count;                 /* Number of nodes in the current gap */                        \
+        int          _i = (int)SLIST->curr_level;                                                            \
                                                                                                              \
-            if (_i < 0)                                                                                      \
-                HGOTO_DONE(NULL);                                                                            \
+        if (_i < 0)                                                                                          \
+            HGOTO_DONE(NULL);                                                                                \
                                                                                                              \
-            H5_GLUE3(H5SL_LOCATE_, CMP, _HASHINIT)                                                           \
-            (KEY, HASHVAL)                                                                                   \
+        H5_GLUE3(H5SL_LOCATE_, CMP, _HASHINIT)                                                               \
+        (KEY, HASHVAL)                                                                                       \
                                                                                                              \
-                /* Find the gap to drop in to at the highest level */                                        \
-                while (X && (!X->key || H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X, KEY, HASHVAL)))    \
-            {                                                                                                \
-                _llast = _last;                                                                              \
-                _last  = X;                                                                                  \
-                X      = X->forward[_i];                                                                     \
-            }                                                                                                \
-            _next = X;                                                                                       \
+            /* Find the gap to drop in to at the highest level */                                            \
+            while (X && (!X->key || H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X, KEY, HASHVAL)))        \
+        {                                                                                                    \
+            _llast = _last;                                                                                  \
+            _last  = X;                                                                                      \
+            X      = X->forward[_i];                                                                         \
+        }                                                                                                    \
+        _next = X;                                                                                           \
                                                                                                              \
-            /* Main loop */                                                                                  \
-            for (_i--; _i >= 0; _i--) {                                                                      \
-                /* Search for the node to drop into, also count the number of */                             \
-                /* nodes of height _i in this gap and keep track of of the node */                           \
-                /* before the one to drop into (_ldrop will become _llast, */                                \
-                /* _drop will become _last). */                                                              \
-                X = _ldrop = _last;                                                                          \
-                _drop      = NULL;                                                                           \
-                for (_count = 0;; _count++) {                                                                \
-                    /* Terminate if this is the last node in the gap */                                      \
-                    if (X->forward[_i] == _next) {                                                           \
-                        if (!_drop)                                                                          \
-                            _drop = X;                                                                       \
-                        break;                                                                               \
-                    } /* end if */                                                                           \
+        /* Main loop */                                                                                      \
+        for (_i--; _i >= 0; _i--) {                                                                          \
+            /* Search for the node to drop into, also count the number of */                                 \
+            /* nodes of height _i in this gap and keep track of of the node */                               \
+            /* before the one to drop into (_ldrop will become _llast, */                                    \
+            /* _drop will become _last). */                                                                  \
+            X = _ldrop = _last;                                                                              \
+            _drop      = NULL;                                                                               \
+            for (_count = 0;; _count++) {                                                                    \
+                /* Terminate if this is the last node in the gap */                                          \
+                if (X->forward[_i] == _next) {                                                               \
+                    if (!_drop)                                                                              \
+                        _drop = X;                                                                           \
+                    break;                                                                                   \
+                }                                                                                            \
                                                                                                              \
-                    /* If we have already found the node to drop into and there */                           \
-                    /* is more than one node in this gap, we can stop searching */                           \
-                    if (_drop) {                                                                             \
-                        HDassert(_count >= 1);                                                               \
-                        _count = 2;                                                                          \
-                        break;                                                                               \
+                /* If we have already found the node to drop into and there */                               \
+                /* is more than one node in this gap, we can stop searching */                               \
+                if (_drop) {                                                                                 \
+                    HDassert(_count >= 1);                                                                   \
+                    _count = 2;                                                                              \
+                    break;                                                                                   \
+                }                                                                                            \
+                else { /* !_drop */                                                                          \
+                    /* Check if this node is the start of the next gap */                                    \
+                    if (!H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) {     \
+                        _drop = X;                                                                           \
+                        /* Again check if we can stop searching */                                           \
+                        if (_count) {                                                                        \
+                            _count = 2;                                                                      \
+                            break;                                                                           \
+                        }                                                                                    \
                     }                                                                                        \
-                    else { /* !_drop */                                                                      \
-                        /* Check if this node is the start of the next gap */                                \
-                        if (!H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, X->forward[_i], KEY, HASHVAL)) { \
-                            _drop = X;                                                                       \
-                            /* Again check if we can stop searching */                                       \
-                            if (_count) {                                                                    \
-                                _count = 2;                                                                  \
-                                break;                                                                       \
-                            } /* end if */                                                                   \
-                        }     /* end if */                                                                   \
-                        else                                                                                 \
-                            _ldrop = X;                                                                      \
-                    } /* end else */                                                                         \
+                    else                                                                                     \
+                        _ldrop = X;                                                                          \
+                }                                                                                            \
                                                                                                              \
-                    /* No need to check the last node in the gap if there are */                             \
-                    /* 3, as there cannot be a fourth */                                                     \
-                    if (_count == 2) {                                                                       \
-                        if (!_drop)                                                                          \
-                            _drop = X->forward[_i];                                                          \
-                        break;                                                                               \
-                    } /* end if */                                                                           \
-                    X = X->forward[_i];                                                                      \
-                } /* end for */                                                                              \
-                HDassert(_count >= 1 && _count <= 3);                                                        \
-                HDassert(!_drop->forward[_i] ||                                                              \
-                         !H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, _drop->forward[_i], KEY, HASHVAL)); \
+                /* No need to check the last node in the gap if there are */                                 \
+                /* 3, as there cannot be a fourth */                                                         \
+                if (_count == 2) {                                                                           \
+                    if (!_drop)                                                                              \
+                        _drop = X->forward[_i];                                                              \
+                    break;                                                                                   \
+                }                                                                                            \
+                X = X->forward[_i];                                                                          \
+            }                                                                                                \
+            HDassert(_count >= 1 && _count <= 3);                                                            \
+            HDassert(!_drop->forward[_i] ||                                                                  \
+                     !H5_GLUE3(H5SL_LOCATE_, CMP, _CMP)(SLIST, TYPE, _drop->forward[_i], KEY, HASHVAL));     \
                                                                                                              \
-                /* Check if we need to adjust node heights */                                                \
-                if (_count == 1) {                                                                           \
-                    /* Check if we are in the first gap */                                                   \
-                    if (_llast == _last) {                                                                   \
-                        /* We are in the first gap, count the number of nodes */                             \
-                        /* of height _i in the next gap.  We need only check */                              \
-                        /* onenode to see if we should promote the first node */                             \
-                        /* in the next gap */                                                                \
-                        _llast = _next->forward[_i + 1];                                                     \
+            /* Check if we need to adjust node heights */                                                    \
+            if (_count == 1) {                                                                               \
+                /* Check if we are in the first gap */                                                       \
+                if (_llast == _last) {                                                                       \
+                    /* We are in the first gap, count the number of nodes */                                 \
+                    /* of height _i in the next gap.  We need only check */                                  \
+                    /* onenode to see if we should promote the first node */                                 \
+                    /* in the next gap */                                                                    \
+                    _llast = _next->forward[_i + 1];                                                         \
                                                                                                              \
-                        /* Demote the separator node */                                                      \
-                        H5SL_DEMOTE(_next, _last)                                                            \
+                    /* Demote the separator node */                                                          \
+                    H5SL_DEMOTE(_next, _last)                                                                \
                                                                                                              \
-                        /* If there are 2 or more nodes, promote the first */                                \
-                        if (_next->forward[_i]->forward[_i] != _llast) {                                     \
-                            X = _next->forward[_i];                                                          \
-                            H5SL_PROMOTE(SLIST, X, _last, NULL)                                              \
-                        }                                                                                    \
-                        else if (!_head->forward[_i + 1]) {                                                  \
-                            /* shrink the header */                                                          \
-                            HDassert(_i == SLIST->curr_level - 1);                                           \
-                            HDassert((size_t)SLIST->curr_level == _head->level);                             \
+                    /* If there are 2 or more nodes, promote the first */                                    \
+                    if (_next->forward[_i]->forward[_i] != _llast) {                                         \
+                        X = _next->forward[_i];                                                              \
+                        H5SL_PROMOTE(SLIST, X, _last, NULL)                                                  \
+                    }                                                                                        \
+                    else if (!_head->forward[_i + 1]) {                                                      \
+                        /* shrink the header */                                                              \
+                        HDassert(_i == SLIST->curr_level - 1);                                               \
+                        HDassert((size_t)SLIST->curr_level == _head->level);                                 \
                                                                                                              \
-                            H5SL_SHRINK(_head, (size_t)(_i + 1))                                             \
-                            SLIST->curr_level--;                                                             \
-                        } /* end else */                                                                     \
+                        H5SL_SHRINK(_head, (size_t)(_i + 1))                                                 \
+                        SLIST->curr_level--;                                                                 \
                     }                                                                                        \
-                    else {                                                                                   \
-                        /* We are not in the first gap, count the number of */                               \
-                        /* nodes of height _i in the previous gap.  Note we */                               \
-                        /* "look ahead" in this loop so X has the value of the */                            \
-                        /* last node in the previous gap. */                                                 \
-                        X = _llast->forward[_i];                                                             \
-                        for (_count = 1; _count < 3 && X->forward[_i] != _last; _count++)                    \
-                            X = X->forward[_i];                                                              \
-                        HDassert(X->forward[_i] == _last);                                                   \
+                }                                                                                            \
+                else {                                                                                       \
+                    /* We are not in the first gap, count the number of */                                   \
+                    /* nodes of height _i in the previous gap.  Note we */                                   \
+                    /* "look ahead" in this loop so X has the value of the */                                \
+                    /* last node in the previous gap. */                                                     \
+                    X = _llast->forward[_i];                                                                 \
+                    for (_count = 1; _count < 3 && X->forward[_i] != _last; _count++)                        \
+                        X = X->forward[_i];                                                                  \
+                    HDassert(X->forward[_i] == _last);                                                       \
                                                                                                              \
-                        /* Demote the separator node */                                                      \
-                        H5SL_DEMOTE(_last, _llast)                                                           \
+                    /* Demote the separator node */                                                          \
+                    H5SL_DEMOTE(_last, _llast)                                                               \
                                                                                                              \
-                        /* If there are 2 or more nodes, promote the last */                                 \
-                        if (_count >= 2)                                                                     \
-                            H5SL_PROMOTE(SLIST, X, _llast, NULL)                                             \
-                        else if (!_head->forward[_i + 1]) {                                                  \
-                            /* shrink the header */                                                          \
-                            HDassert(_i == SLIST->curr_level - 1);                                           \
-                            HDassert((size_t)SLIST->curr_level == _head->level);                             \
+                    /* If there are 2 or more nodes, promote the last */                                     \
+                    if (_count >= 2)                                                                         \
+                        H5SL_PROMOTE(SLIST, X, _llast, NULL)                                                 \
+                    else if (!_head->forward[_i + 1]) {                                                      \
+                        /* shrink the header */                                                              \
+                        HDassert(_i == SLIST->curr_level - 1);                                               \
+                        HDassert((size_t)SLIST->curr_level == _head->level);                                 \
                                                                                                              \
-                            H5SL_SHRINK(_head, (size_t)(_i + 1))                                             \
-                            SLIST->curr_level--;                                                             \
-                        } /* end else */                                                                     \
-                    }     /* end else */                                                                     \
-                }         /* end if */                                                                       \
+                        H5SL_SHRINK(_head, (size_t)(_i + 1))                                                 \
+                        SLIST->curr_level--;                                                                 \
+                    }                                                                                        \
+                }                                                                                            \
+            }                                                                                                \
                                                                                                              \
-                /* Prepare to drop down */                                                                   \
-                _llast = _ldrop;                                                                             \
-                _last  = _drop;                                                                              \
-                _next  = _drop->forward[_i];                                                                 \
-            } /* end for */                                                                                  \
+            /* Prepare to drop down */                                                                       \
+            _llast = _ldrop;                                                                                 \
+            _last  = _drop;                                                                                  \
+            _next  = _drop->forward[_i];                                                                     \
+        }                                                                                                    \
                                                                                                              \
-            /* Check if we've found the node */                                                              \
-            if (_next && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, _next, KEY, HASHVAL)) {               \
-                void *tmp = _next->item;                                                                     \
-                X         = _next;                                                                           \
+        /* Check if we've found the node */                                                                  \
+        if (_next && H5_GLUE3(H5SL_LOCATE_, CMP, _EQ)(SLIST, TYPE, _next, KEY, HASHVAL)) {                   \
+            void *tmp = _next->item;                                                                         \
+            X         = _next;                                                                               \
                                                                                                              \
-                /* If the node has a height > 0, swap it with its (lower) */                                 \
-                /* neighbor */                                                                               \
-                if (X->level) {                                                                              \
-                    X              = X->backward;                                                            \
-                    _next->key     = X->key;                                                                 \
-                    _next->item    = X->item;                                                                \
-                    _next->hashval = X->hashval;                                                             \
-                } /* end if */                                                                               \
-                HDassert(!X->level);                                                                         \
+            /* If the node has a height > 0, swap it with its (lower) */                                     \
+            /* neighbor */                                                                                   \
+            if (X->level) {                                                                                  \
+                X              = X->backward;                                                                \
+                _next->key     = X->key;                                                                     \
+                _next->item    = X->item;                                                                    \
+                _next->hashval = X->hashval;                                                                 \
+            }                                                                                                \
+            HDassert(!X->level);                                                                             \
                                                                                                              \
-                /* Remove the node */                                                                        \
-                X->backward->forward[0] = X->forward[0];                                                     \
-                if (SLIST->last == X)                                                                        \
-                    SLIST->last = X->backward;                                                               \
-                else                                                                                         \
-                    X->forward[0]->backward = X->backward;                                                   \
-                SLIST->nobjs--;                                                                              \
-                X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[0], X->forward);                       \
-                X          = H5FL_FREE(H5SL_node_t, X);                                                      \
+            /* Remove the node */                                                                            \
+            X->backward->forward[0] = X->forward[0];                                                         \
+            if (SLIST->last == X)                                                                            \
+                SLIST->last = X->backward;                                                                   \
+            else                                                                                             \
+                X->forward[0]->backward = X->backward;                                                       \
+            SLIST->nobjs--;                                                                                  \
+            X->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[0], X->forward);                           \
+            X          = H5FL_FREE(H5SL_node_t, X);                                                          \
                                                                                                              \
-                HGOTO_DONE(tmp);                                                                             \
-            } /* end if */                                                                                   \
-        }     /* end else */                                                                                 \
+            HGOTO_DONE(tmp);                                                                                 \
+        }                                                                                                    \
     }
 
 /* Macro used to search for node */
@@ -542,7 +487,6 @@ struct H5SL_node_t {
     size_t               level;      /* The level of this node */
     size_t               log_nalloc; /* log2(Number of slots allocated in forward) */
     uint32_t             hashval;    /* Hash value for key (only for strings, currently) */
-    hbool_t              removed;    /* Whether the node is "removed" (actual removal deferred) */
     struct H5SL_node_t **forward;    /* Array of forward pointers from this node */
     struct H5SL_node_t * backward;   /* Backward pointer from this node */
 };
@@ -558,8 +502,6 @@ struct H5SL_t {
     size_t       nobjs;      /* Number of active objects in skip list */
     H5SL_node_t *header;     /* Header for nodes in skip list */
     H5SL_node_t *last;       /* Pointer to last node in skip list */
-    hbool_t safe_iterating;  /* Whether a routine is "safely" iterating over the list and removals should be
-                                deferred */
 };
 
 /* Static functions */
@@ -651,11 +593,11 @@ H5SL_term_package(void)
             for (i = 0; i < H5SL_fac_nused_g; i++) {
                 ret = H5FL_fac_term(H5SL_fac_g[i]);
                 HDassert(ret >= 0);
-            } /* end if */
+            }
             H5SL_fac_nused_g = 0;
 
             n++;
-        } /* end if */
+        }
 
         /* Free the list of factories */
         if (H5SL_fac_g) {
@@ -663,12 +605,12 @@ H5SL_term_package(void)
             H5SL_fac_nalloc_g = 0;
 
             n++;
-        } /* end if */
+        }
 
         /* Mark the interface as uninitialized */
         if (0 == n)
             H5_PKG_INIT_VAR = FALSE;
-    } /* end if */
+    }
 
     FUNC_LEAVE_NOAPI(n)
 } /* H5SL_term_package() */
@@ -711,11 +653,10 @@ H5SL__new_node(void *item, const void *key, uint32_t hashval)
     ret_value->item    = item;
     ret_value->level   = 0;
     ret_value->hashval = hashval;
-    ret_value->removed = FALSE;
     if (NULL == (ret_value->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0]))) {
         ret_value = H5FL_FREE(H5SL_node_t, ret_value);
         HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "memory allocation failed")
-    } /* end if */
+    }
     ret_value->log_nalloc = 0;
 
 done:
@@ -805,7 +746,7 @@ H5SL__insert_common(H5SL_t *slist, void *item, const void *key)
 
         default:
             HDassert(0 && "Unknown skiplist type!");
-    } /* end switch */
+    }
 
     /* 'key' must not have been found in existing list, if we get here */
 
@@ -880,15 +821,22 @@ H5SL__release_common(H5SL_t *slist, H5SL_operator_t op, void *op_data)
     while (node) {
         next_node = node->forward[0];
 
-        /* Call callback, if one is given */
+        /* Call callback, if one is given.
+         *
+         * Ignoring const here is fine as we only need the value to be const
+         * with respect to the list code, which should never modify the
+         * elements. The library code that is making use of the skip list
+         * container can do what it likes with the elements.
+         */
+        H5_GCC_CLANG_DIAG_OFF("cast-qual")
         if (op)
-            /* Casting away const OK -QAK */
             (void)(op)(node->item, (void *)node->key, op_data);
+        H5_GCC_CLANG_DIAG_ON("cast-qual")
 
         node->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[node->log_nalloc], node->forward);
         node          = H5FL_FREE(H5SL_node_t, node);
         node          = next_node;
-    } /* end while */
+    }
 
     /* Reset the header pointers */
     slist->header->forward =
@@ -1001,9 +949,8 @@ H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp)
     new_slist->cmp = cmp;
 
     /* Set the dynamic internal fields */
-    new_slist->curr_level     = -1;
-    new_slist->nobjs          = 0;
-    new_slist->safe_iterating = FALSE;
+    new_slist->curr_level = -1;
+    new_slist->nobjs      = 0;
 
     /* Allocate the header node */
     if (NULL == (header = H5SL__new_node(NULL, NULL, (uint32_t)ULONG_MAX)))
@@ -1027,7 +974,7 @@ done:
     if (ret_value == NULL) {
         if (new_slist != NULL)
             new_slist = H5FL_FREE(H5SL_t, new_slist);
-    } /* end if */
+    }
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_create() */
@@ -1058,9 +1005,6 @@ H5SL_count(H5SL_t *slist)
     /* Check args */
     HDassert(slist);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -1099,9 +1043,6 @@ H5SL_insert(H5SL_t *slist, void *item, const void *key)
     HDassert(slist);
     HDassert(key);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -1148,9 +1089,6 @@ H5SL_add(H5SL_t *slist, void *item, const void *key)
     HDassert(slist);
     HDassert(key);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -1242,7 +1180,7 @@ H5SL_remove(H5SL_t *slist, const void *key)
 
         default:
             HDassert(0 && "Unknown skiplist type!");
-    } /* end switch */
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1281,9 +1219,6 @@ H5SL_remove_first(H5SL_t *slist)
     /* Check args */
     HDassert(slist);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Assign level */
     H5_CHECK_OVERFLOW(slist->curr_level, int, size_t);
     level = (size_t)slist->curr_level;
@@ -1345,12 +1280,12 @@ H5SL_remove_first(H5SL_t *slist)
 
                     H5SL_SHRINK(head, level)
                     slist->curr_level--;
-                } /* end else */
+                }
             }
             else
                 break;
-        } /* end for */
-    }     /* end if */
+        }
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1436,7 +1371,7 @@ H5SL_search(H5SL_t *slist, const void *key)
 
         default:
             HDassert(0 && "Unknown skiplist type!");
-    } /* end switch */
+    }
 
     /* 'key' must not have been found in list, if we get here */
     ret_value = NULL;
@@ -1480,9 +1415,6 @@ H5SL_less(H5SL_t *slist, const void *key)
     HDassert(slist);
     HDassert(key);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -1531,7 +1463,7 @@ H5SL_less(H5SL_t *slist, const void *key)
 
         default:
             HDassert(0 && "Unknown skiplist type!");
-    } /* end switch */
+    }
 
     /* An exact match for 'key' must not have been found in list, if we get here */
     /* Check for a node with a key that is less than the given 'key' */
@@ -1541,13 +1473,13 @@ H5SL_less(H5SL_t *slist, const void *key)
             ret_value = slist->last->item;
         else
             ret_value = NULL;
-    } /* end if */
+    }
     else {
         if (x->backward != slist->header)
             ret_value = x->backward->item;
         else
             ret_value = NULL;
-    } /* end else */
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1588,9 +1520,6 @@ H5SL_greater(H5SL_t *slist, const void *key)
     HDassert(slist);
     HDassert(key);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -1639,7 +1568,7 @@ H5SL_greater(H5SL_t *slist, const void *key)
 
         default:
             HDassert(0 && "Unknown skiplist type!");
-    } /* end switch */
+    }
 
     /* An exact match for 'key' must not have been found in list, if we get here */
     /* ('x' must be the next node with a key greater than the 'key', or NULL) */
@@ -1734,7 +1663,7 @@ H5SL_find(H5SL_t *slist, const void *key)
 
         default:
             HDassert(0 && "Unknown skiplist type!");
-    } /* end switch */
+    }
 
     /* 'key' must not have been found in list, if we get here */
     ret_value = NULL;
@@ -1826,7 +1755,7 @@ H5SL_below(H5SL_t *slist, const void *key)
 
         default:
             HDassert(0 && "Unknown skiplist type!");
-    } /* end switch */
+    }
 
     /* An exact match for 'key' must not have been found in list, if we get here */
     /* Check for a node with a key that is less than the given 'key' */
@@ -1836,13 +1765,13 @@ H5SL_below(H5SL_t *slist, const void *key)
             ret_value = slist->last;
         else
             ret_value = NULL;
-    } /* end if */
+    }
     else {
         if (x->backward != slist->header)
             ret_value = x->backward;
         else
             ret_value = NULL;
-    } /* end else */
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1931,7 +1860,7 @@ H5SL_above(H5SL_t *slist, const void *key)
 
         default:
             HDassert(0 && "Unknown skiplist type!");
-    } /* end switch */
+    }
 
     /* An exact match for 'key' must not have been found in list, if we get here */
     /* ('x' must be the next node with a key greater than the 'key', or NULL) */
@@ -1971,9 +1900,6 @@ H5SL_first(H5SL_t *slist)
     /* Check args */
     HDassert(slist);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -2007,9 +1933,6 @@ H5SL_next(H5SL_node_t *slist_node)
     /* Check args */
     HDassert(slist_node);
 
-    /* Not currently supported */
-    HDassert(!slist_node->removed);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -2043,9 +1966,6 @@ H5SL_prev(H5SL_node_t *slist_node)
     /* Check args */
     HDassert(slist_node);
 
-    /* Not currently supported */
-    HDassert(!slist_node->removed);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -2080,9 +2000,6 @@ H5SL_last(H5SL_t *slist)
     /* Check args */
     HDassert(slist);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -2116,9 +2033,6 @@ H5SL_item(H5SL_node_t *slist_node)
     /* Check args */
     HDassert(slist_node);
 
-    /* Not currently supported */
-    HDassert(!slist_node->removed);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -2179,15 +2093,21 @@ H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data)
         /* Protect against the node being deleted by the callback */
         next = node->forward[0];
 
-        /* Call the iterator callback */
-        /* Casting away const OK -QAK */
-        if (!node->removed)
-            if ((ret_value = (op)(node->item, (void *)node->key, op_data)) != 0)
-                break;
+        /* Call the iterator callback
+         *
+         * Ignoring const here is fine as we only need the value to be const
+         * with respect to the list code, which should never modify the
+         * elements. The library code that is making use of the skip list
+         * container can do what it likes with the elements.
+         */
+        H5_GCC_CLANG_DIAG_OFF("cast-qual")
+        if ((ret_value = (op)(node->item, (void *)node->key, op_data)) != 0)
+            break;
+        H5_GCC_CLANG_DIAG_ON("cast-qual")
 
         /* Advance to next node */
         node = next;
-    } /* end while */
+    }
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_iterate() */
@@ -2222,9 +2142,6 @@ H5SL_release(H5SL_t *slist)
     /* Check args */
     HDassert(slist);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -2274,9 +2191,6 @@ H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data)
     /* Check args */
     HDassert(slist);
 
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
     /* Check internal consistency */
     /* (Pre-condition) */
 
@@ -2290,186 +2204,6 @@ done:
 
 /*--------------------------------------------------------------------------
  NAME
-    H5SL_try_free_safe
- PURPOSE
-    Makes the supplied callback on all nodes in the skip list, freeing each
-    node that the callback returns TRUE for.
- USAGE
-    herr_t PURPOSE(slist,op,opdata)
-        H5SL_t *slist;          IN/OUT: Pointer to skip list to release nodes
-        H5SL_try_free_op_t op;  IN: Callback function to try to free item & key
-        void *op_data;          IN/OUT: Pointer to application data for callback
-
- RETURNS
-    Returns non-negative on success, negative on failure.
- DESCRIPTION
-    Makes the supplied callback on all nodes in the skip list, freeing each
-    node that the callback returns TRUE for.  The iteration is performed in
-    a safe manner, such that the callback can call H5SL_remove(),
-    H5SL_search(), H5SL_find(), and H5SL_iterate() on nodes in this
-    skiplist, except H5SL_remove() may not be call on *this* node.
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
-    This function is written to be most efficient when most nodes are
-    removed from the skiplist, as it rebuilds the nodes afterwards.
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-herr_t
-H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data)
-{
-    H5SL_node_t *node, *next_node, *last_node; /* Pointers to skip list nodes */
-    htri_t       op_ret;
-    herr_t       ret_value = SUCCEED;
-
-    FUNC_ENTER_NOAPI_NOINIT
-
-    /* Check args */
-    HDassert(slist);
-    HDassert(op);
-
-    /* Not currently supported */
-    HDassert(!slist->safe_iterating);
-
-    /* Check internal consistency */
-    /* (Pre-condition) */
-
-    /* Mark skip list as safe iterating, so nodes aren't freed out from under
-     * us */
-    slist->safe_iterating = TRUE;
-
-    /* Iterate over skip list nodes, making the callback for each and marking
-     * them as removed if requested by the callback */
-    node = slist->header->forward[0];
-    while (node) {
-        /* Check if the node was already removed */
-        if (!node->removed) {
-            /* Call callback */
-            /* Casting away const OK -NAF */
-            if ((op_ret = (op)(node->item, (void *)node->key, op_data)) < 0)
-                HGOTO_ERROR(H5E_SLIST, H5E_CALLBACK, FAIL, "callback operation failed")
-
-            /* Check if op indicated that the node should be removed */
-            if (op_ret)
-                /* Mark the node as removed */
-                node->removed = TRUE;
-        } /* end if */
-
-        /* Advance node */
-        node = node->forward[0];
-    } /* end while */
-
-    /* Reset safe_iterating */
-    slist->safe_iterating = FALSE;
-
-    /* Iterate over nodes, freeing ones marked as removed */
-    node      = slist->header->forward[0];
-    last_node = slist->header;
-    while (node) {
-        /* Save next node */
-        next_node = node->forward[0];
-
-        /* Check if the node was marked as removed */
-        if (node->removed) {
-            /* Remove the node */
-            node->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[node->log_nalloc], node->forward);
-            node          = H5FL_FREE(H5SL_node_t, node);
-            slist->nobjs--;
-        } /* end if */
-        else {
-            /* Update backwards and forwards[0] pointers, and set the level to
-             * 0.  Since the list is flattened we must rebuild the skiplist
-             * afterwards. */
-            /* Set level to 0.  Note there is no need to preserve
-             * node->forward[0] since it was cached above and will always be
-             * updated later. */
-            if (node->level > 0) {
-                node->forward =
-                    (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[node->log_nalloc], (void *)node->forward);
-                if (NULL == (node->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0])))
-                    HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, FAIL, "memory allocation failed")
-                node->log_nalloc = 0;
-                node->level      = 0;
-            } /* end if */
-
-            /* Update pointers */
-            last_node->forward[0] = node;
-            node->backward        = last_node;
-            last_node             = node;
-        } /* end else */
-
-        /* Advance node */
-        node = next_node;
-    } /* end while */
-
-    /* Final pointer update */
-    last_node->forward[0] = NULL;
-    slist->last           = last_node;
-
-    /* Demote skip list to level 0 */
-    if (slist->curr_level > 0) {
-        HDassert(slist->header->level == (size_t)slist->curr_level);
-
-        node                   = slist->header->forward[0];
-        slist->header->forward = (H5SL_node_t **)H5FL_FAC_FREE(H5SL_fac_g[slist->header->log_nalloc],
-                                                               (void *)slist->header->forward);
-        if (NULL == (slist->header->forward = (H5SL_node_t **)H5FL_FAC_MALLOC(H5SL_fac_g[0])))
-            HGOTO_ERROR(H5E_SLIST, H5E_CANTALLOC, FAIL, "memory allocation failed")
-        slist->header->forward[0] = node;
-        slist->header->log_nalloc = 0;
-        slist->header->level      = 0;
-    } /* end if */
-
-    /* Check if there are any nodes left */
-    if (slist->nobjs > 0) {
-        int i;
-
-        HDassert(slist->header->forward[0]);
-
-        /* Set skiplist level to 0 */
-        slist->curr_level = 0;
-
-        /* Rebuild the forward arrays */
-        for (i = 0; slist->curr_level >= i; i++) {
-            HDassert(slist->curr_level == i);
-
-            /* Promote every third node this level until we run out of nodes */
-            node = last_node = slist->header;
-            while (1) {
-                /* Check second node in gap, if not present, no need to promote
-                 * further this level. */
-                HDassert(node->forward[i]);
-                node = node->forward[i]->forward[i];
-                if (!node)
-                    break;
-
-                /* Check third and fourth node in gap, if either is not present,
-                 * no need to promote further this level. */
-                node = node->forward[i];
-                if (!node || !node->forward[i])
-                    break;
-
-                /* Promote the third node in the gap */
-                H5SL_PROMOTE(slist, node, last_node, FAIL)
-                last_node = node;
-            } /* end while */
-        }     /* end for */
-    }         /* end if */
-    else {
-        HDassert(!slist->header->forward[0]);
-        HDassert(slist->last == slist->header);
-        HDassert(slist->nobjs == 0);
-
-        /* Reset the skiplist level */
-        slist->curr_level = -1;
-    } /* end else */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5SL_try_free_safe() */
-
-/*--------------------------------------------------------------------------
- NAME
     H5SL_destroy
  PURPOSE
     Close a skip list, deallocating it and freeing all its nodes.
diff --git a/src/H5SLprivate.h b/src/H5SLprivate.h
index c9e1147..be6f7b6 100644
--- a/src/H5SLprivate.h
+++ b/src/H5SLprivate.h
@@ -60,9 +60,6 @@ typedef int (*H5SL_cmp_t)(const void *key1, const void *key2);
 /* Typedef for iteration operations */
 typedef herr_t (*H5SL_operator_t)(void *item, void *key, void *operator_data /*in,out*/);
 
-/* Typedef for H5SL_try_free_safe operation callback */
-typedef htri_t (*H5SL_try_free_op_t)(void *item, void *key, void *operator_data /*in,out*/);
-
 /********************/
 /* Private routines */
 /********************/
@@ -86,7 +83,6 @@ H5_DLL void *       H5SL_item(H5SL_node_t *slist_node);
 H5_DLL herr_t       H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data);
 H5_DLL herr_t       H5SL_release(H5SL_t *slist);
 H5_DLL herr_t       H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data);
-H5_DLL herr_t       H5SL_try_free_safe(H5SL_t *slist, H5SL_try_free_op_t op, void *op_data);
 H5_DLL herr_t       H5SL_close(H5SL_t *slist);
 H5_DLL herr_t       H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data);
 H5_DLL int          H5SL_term_interface(void);
diff --git a/test/tskiplist.c b/test/tskiplist.c
index 4bf9b11..31b5cff 100644
--- a/test/tskiplist.c
+++ b/test/tskiplist.c
@@ -1165,213 +1165,6 @@ test_skiplist_free(void)
 
 /****************************************************************
 **
-**  test_skiplist_try_free_safe(): Test H5SL (skip list) code.
-**      Tests 'try_free_safe' operation in skip lists.
-**
-****************************************************************/
-/* Macro definitions */
-#define TEST_TFS_MAX_NOBJS 100
-#define TEST_TFS_MIN_NOBJS 5
-#define TEST_TFS_NITER     50
-
-/* Structure to hold the list of objects */
-typedef struct {
-    H5SL_t *               slist;     /* Skiplist holding the objects */
-    struct test_tfs_obj_t *list;      /* Linear list of objects */
-    int                    nobjs;     /* Number of objects in list */
-    int                    nobjs_rem; /* Number of objects in list that have not been freed */
-} test_tfs_list_t;
-
-/* Structure for an object */
-typedef struct test_tfs_obj_t {
-    int idx;    /* Index (key) for this object */
-    int nfrees; /* Number of times this object has been freed */
-} test_tfs_obj_t;
-
-/* op_data struct for H5SL_iterate() */
-typedef struct test_tfs_it_ud_t {
-    test_tfs_list_t *obj_list; /* List of objects */
-    int              last_idx; /* Index of last object visited in iteration */
-    int              ncalls;   /* Number of times this callback was called */
-} test_tfs_it_ud_t;
-
-/* iterate callback */
-static herr_t
-test_tfs_iter(void *_obj, void *key, void *_udata)
-{
-    test_tfs_obj_t *  obj   = (test_tfs_obj_t *)_obj;
-    test_tfs_it_ud_t *udata = (test_tfs_it_ud_t *)_udata;
-
-    /* Check consistency */
-    CHECK_PTR_EQ((void *)&obj->idx, key, "obj->idx");
-    CHECK_PTR_EQ(obj, &udata->obj_list->list[obj->idx], "obj_list->list[obj->idx]");
-
-    /* Increment number of calls */
-    udata->ncalls++;
-
-    /* Verify we were given the correct object */
-    do {
-        udata->last_idx++;
-    } while (udata->obj_list->list[udata->last_idx].nfrees != 0);
-    VERIFY(udata->last_idx, obj->idx, "H5SL_iterate");
-
-    return 0;
-} /* end test_tfs_iter() */
-
-/* try_free_safe callback */
-static htri_t
-test_tfs_free(void *_obj, void *key, void *_obj_list)
-{
-    test_tfs_obj_t * obj      = (test_tfs_obj_t *)_obj;
-    test_tfs_list_t *obj_list = (test_tfs_list_t *)_obj_list;
-    test_tfs_it_ud_t iter_ud;
-    int              nrems, rem_idx, i, j;
-    test_tfs_obj_t * obj_ret;
-    herr_t           ret; /* return value */
-    htri_t           ret_value;
-
-    /* Check consistency */
-    CHECK_PTR_EQ((void *)&obj->idx, key, "obj->idx");
-    CHECK_PTR_EQ(obj, &obj_list->list[obj->idx], "obj_list->list[obj->idx]");
-
-    /* Mark this object as freed (to make sure it isn't recursively freed, that
-     * is not something we support, we will undo this if we decide later not to
-     * free the object) */
-    obj->nfrees++;
-    obj_list->nobjs_rem--;
-
-    /* Decide how many objects to remove */
-    nrems = (int)(HDrandom() % (long)3);
-
-    /* Remove objects */
-    for (i = 0; i < nrems; i++)
-        /* Check nobjs_rem */
-        if (obj_list->nobjs_rem > 0) {
-            /* Remove a random object from the list */
-            rem_idx = (int)(HDrandom() % (long)obj_list->nobjs_rem);
-
-            /* Scan the list, finding the rem_idx'th object that has not been
-             * freed */
-            for (j = 0; j < obj_list->nobjs; j++)
-                if (obj_list->list[j].nfrees == 0) {
-                    if (rem_idx == 0)
-                        break;
-                    else
-                        rem_idx--;
-                } /* end if */
-            if (j == obj_list->nobjs)
-                ERROR("invalid obj_list");
-            else {
-                /* Remove the object */
-                obj_ret = (test_tfs_obj_t *)H5SL_remove(obj_list->slist, &j);
-                CHECK_PTR(obj_ret, "H5SL_remove");
-                obj_ret->nfrees++;
-                obj_list->nobjs_rem--;
-            } /* end else */
-        }     /* end if */
-
-    /* Mark this object as not freed so we know to expect it in the iterate call
-     */
-    obj->nfrees--;
-    obj_list->nobjs_rem++;
-
-    /* Iterate over skip list (maybe) */
-    if (HDrandom() % (long)5) {
-        iter_ud.obj_list = obj_list;
-        iter_ud.last_idx = -1;
-        iter_ud.ncalls   = 0;
-        ret              = H5SL_iterate(obj_list->slist, test_tfs_iter, &iter_ud);
-        CHECK(ret, FAIL, "H5SL_iterate");
-        VERIFY(iter_ud.ncalls, obj_list->nobjs_rem, "H5SL_iterate");
-    } /* end if */
-
-    /* Verify nobjs_rem is non-negative */
-    if (obj_list->nobjs_rem < 0)
-        ERROR("invalid nobjs_rem");
-
-    /* Decide whether this object should be freed */
-    if (HDrandom() % (long)2) {
-        /* Free the object */
-        ret_value = TRUE;
-        obj->nfrees++;
-        obj_list->nobjs_rem--;
-    } /* end if */
-    else
-        /* Do not free the object */
-        ret_value = FALSE;
-
-    return ret_value;
-} /* end test_tfs_free() */
-
-/* Test function */
-static void
-test_skiplist_try_free_safe(void)
-{
-    test_tfs_list_t obj_list;
-    test_tfs_obj_t  list[TEST_TFS_MAX_NOBJS];
-    int             i, j;
-    int             nobjs_found;
-    hsize_t         count;
-    herr_t          ret; /* Generic return value */
-
-    /* Output message about test being performed */
-    MESSAGE(7, ("Testing Skip List 'Try Free Safe' Operation\n"));
-
-    /* Create a skip list */
-    obj_list.slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK_PTR(obj_list.slist, "H5SL_create");
-
-    /* Init obj_list.list */
-    obj_list.list = list;
-    for (j = 0; j < TEST_TFS_MAX_NOBJS; j++)
-        list[j].idx = j;
-
-    for (i = 0; i < TEST_TFS_NITER; i++) {
-        /* Build object list */
-        obj_list.nobjs = obj_list.nobjs_rem =
-            (int)(TEST_TFS_MIN_NOBJS + (HDrandom() % (long)(TEST_TFS_MAX_NOBJS - TEST_TFS_MIN_NOBJS + 1)));
-        for (j = 0; j < obj_list.nobjs; j++) {
-            list[j].nfrees = 0;
-            ret            = H5SL_insert(obj_list.slist, &list[j], &list[j].idx);
-            CHECK(ret, FAIL, "H5SL_insert");
-        } /* end for */
-
-        /* Call H5S_try_free_safe() - free most of the items in the skip list in
-         * a safe manner */
-        ret = H5SL_try_free_safe(obj_list.slist, test_tfs_free, &obj_list);
-        CHECK(ret, FAIL, "H5SL_try_free_safe");
-
-        /* Verify list */
-        nobjs_found = 0;
-        for (j = 0; j < obj_list.nobjs; j++)
-            if (list[j].nfrees == 0)
-                nobjs_found++;
-            else
-                VERIFY(list[j].nfrees, (long)1, "list[j].nfrees");
-
-        /* Verify number of objects */
-        VERIFY(obj_list.nobjs_rem, nobjs_found, "obj_list.nobjs_rem");
-        count = H5SL_count(obj_list.slist);
-        VERIFY(count, (size_t)nobjs_found, "H5SL_count");
-
-        /* Release the skip list, forcibly freeing all nodes (will not make
-         * callbacks) */
-        ret = H5SL_release(obj_list.slist);
-        CHECK(ret, FAIL, "H5SL_release");
-
-        /* Verify number of objects is 0 */
-        count = H5SL_count(obj_list.slist);
-        VERIFY(count, (size_t)0, "H5SL_count");
-    } /* end for */
-
-    /* Close the skip list */
-    ret = H5SL_close(obj_list.slist);
-    CHECK(ret, FAIL, "H5SL_close");
-
-} /* end test_skiplist_try_free_safe() */
-
-/****************************************************************
-**
 **  test_skiplist_less(): Test H5SL (skip list) code.
 **      Tests 'less' operation in skip lists.
 **
@@ -1796,7 +1589,6 @@ test_skiplist(void)
     test_skiplist_add();               /* Test 'add' operation */
     test_skiplist_destroy();           /* Test 'destroy' operation */
     test_skiplist_free();              /* Test 'free' operation */
-    test_skiplist_try_free_safe();     /* Test 'try_free_safe' operation */
     test_skiplist_less();              /* Test 'less' operation */
     test_skiplist_greater();           /* Test 'greater' operation */
     test_skiplist_below();             /* Test 'below' operation */
-- 
cgit v0.12


From aee9e06aa8ff85397a54f7955d62466d39b23ddc Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Mon, 25 Oct 2021 21:17:23 -0500
Subject: Consolidate VFD create list macro (#1132)

---
 CMakeLists.txt                          | 3 +++
 c++/test/CMakeVFDTests.cmake            | 2 --
 config/cmake/HDF5Macros.cmake           | 1 +
 test/CMakeVFDTests.cmake                | 3 +--
 testpar/CMakeVFDTests.cmake             | 2 --
 tools/test/h5dump/CMakeVFDTests.cmake   | 2 --
 tools/test/h5repack/CMakeVFDTests.cmake | 2 --
 7 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c6df76..2b5ff7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -946,6 +946,9 @@ if (BUILD_TESTING)
   if (HDF5_TEST_VFD)
     option (HDF5_TEST_FHEAP_VFD "Execute tests with different VFDs" ON)
     mark_as_advanced (HDF5_TEST_FHEAP_VFD)
+
+    # Initialize the list of VFDs to be used for testing and create a test folder for each VFD
+    H5_SET_VFD_LIST()
   endif ()
 
   option (HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF)
diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake
index d525bb5..4f3d137 100644
--- a/c++/test/CMakeVFDTests.cmake
+++ b/c++/test/CMakeVFDTests.cmake
@@ -16,8 +16,6 @@
 ##############################################################################
 ##############################################################################
 
-H5_SET_VFD_LIST()
-
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S  M A C R O S                               ###
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index b3cf015..1a0e8b3 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -60,6 +60,7 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage)
   endif ()
 endmacro ()
 
+# Initialize the list of VFDs to be used for testing and create a test folder for each VFD
 macro (H5_SET_VFD_LIST)
   set (VFD_LIST
       sec2
diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index e557676..130b0bf 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -17,8 +17,7 @@
 ##############################################################################
 # included from CMakeTests.cmake
 
-H5_SET_VFD_LIST()
-
+# create more test folders for each VFD
 foreach (vfdtest ${VFD_LIST})
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles")
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files")
diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake
index 4cda27b..12df1e9 100644
--- a/testpar/CMakeVFDTests.cmake
+++ b/testpar/CMakeVFDTests.cmake
@@ -21,8 +21,6 @@ set (H5P_VFD_TESTS
     t_pflush2
 )
 
-H5_SET_VFD_LIST()
-
 macro (ADD_VFD_TEST vfdname resultcode)
   if (NOT HDF5_ENABLE_USING_MEMCHECKER)
     foreach (h5_test ${H5P_VFD_TESTS})
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index 6a70b85..b6e0bea 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -16,8 +16,6 @@
 ##############################################################################
 ##############################################################################
 
-H5_SET_VFD_LIST()
-
 # --------------------------------------------------------------------
 # Copy all the HDF5 files from the source directory into the test directory
 # --------------------------------------------------------------------
diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake
index 78d752c..e50414f 100644
--- a/tools/test/h5repack/CMakeVFDTests.cmake
+++ b/tools/test/h5repack/CMakeVFDTests.cmake
@@ -16,8 +16,6 @@
 ##############################################################################
 ##############################################################################
 
-H5_SET_VFD_LIST()
-
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S  M A C R O S                               ###
-- 
cgit v0.12


From 8d1fe4416429d8a902f042b280fc3a438e9ba0bf Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Mon, 25 Oct 2021 21:17:44 -0500
Subject: H5repack tests should fail if a corrupted file causes h5repack to
 (#1138)

* H5repack tests should fail if a corrupted file causes h5repack to
segfault/core dump.

* Add release note for HDFV-10590, CVE-2018-17432.
---
 release_docs/RELEASE.txt             | 11 +++++++++++
 tools/test/h5repack/CMakeTests.cmake |  6 +++---
 tools/test/h5repack/h5repack.sh.in   | 17 ++++++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index f12fbb8..247f182 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1132,6 +1132,17 @@ Bug Fixes since HDF5-1.12.0 release
 
         (NAF - 2021/01/22)
 
+    - Fixed CVE-2018-17432
+
+        The tool h5repack produced a segfault on a corrupted file which had
+        invalid rank for scalar or NULL datatype.
+
+        The problem was fixed by modifying the dataspace encode and decode
+        functions to detect and report invalid rank. h5repack now fails
+        with an error message for the corrupted file.
+
+        (BMR - 2020/10/26, HDFFV-10590)
+
     - Creation of dataset with optional filter
 
         When the combination of type, space, etc doesn't work for filter
diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index 037287d..397c3ac 100644
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -1544,7 +1544,7 @@
 # the references in attribute of compund or vlen datatype
   ADD_H5_TEST (HDFFV-5932 "TEST" ${FILE_ATTR_REF})
 
-# Add test for memory leak in attirbute. This test is verified by CTEST.
+# Add test for memory leak in attribute. This test is verified by CTEST.
 # 1. leak from vlen string
 # 2. leak from compound type without reference member
 # (HDFFV-7840, )
@@ -1552,12 +1552,12 @@
   ADD_H5_TEST (HDFFV-7840 "TEST" h5diff_attr1.h5)
 
 # test CVE-2018-17432 fix
-  set (arg h5repack_CVE-2018-17432.h5 h5repack__CVE-2018-17432_out.h5 --low=1 --high=2 -f GZIP=8 -l dset1:CHUNK=5x6)
+  set (arg h5repack_CVE-2018-17432.h5 --low=1 --high=2 -f GZIP=8 -l dset1:CHUNK=5x6)
   set (TESTTYPE "TEST")
   ADD_H5_FILTER_TEST (HDFFV-10590 "" ${TESTTYPE} 1 ${arg})
 
 # test CVE-2018-14460 fix
-  set (arg h5repack_CVE-2018-14460.h5 h5repack_CVE-2018-14460_out.h5)
+  set (arg h5repack_CVE-2018-14460.h5)
   set (TESTTYPE "TEST")
   ADD_H5_FILTER_TEST (HDFFV-11223 "" ${TESTTYPE} 1 ${arg})
 
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index 3756a95..1e54670 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -885,13 +885,24 @@ TOOLTEST_FAIL()
     (
         cd $TESTDIR
         $ENVCMD $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
-    ) >$actual
+    ) >&$actual
     RET=$?
-    if [ $RET == 0 ] ; then
+
+    # Normally h5repack of files tested with this function are expected
+    # to return not 0, but if the command results in "Segmentation fault"
+    # or "core dumped" it is a failure regardless of the return value.
+    failure=`grep -e 'Segmentation fault' -e 'core dumped' $actual`
+    if [ "$failure" != "" ]; then
         nerrors="`expr $nerrors + 1`"
         echo " FAILED"
+        echo "    $failure"
     else
-        echo " PASSED"
+        if [ $RET == 0 ] ; then
+            nerrors="`expr $nerrors + 1`"
+            echo " FAILED"
+        else
+            echo " PASSED"
+        fi
     fi
     rm -f $outfile
 }
-- 
cgit v0.12


From 07a3a1c70b4b276497d5f837296c54930b5d675a Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:32:33 -0500
Subject: Github #1019 - add Fortran developer flags (#1090)

---
 MANIFEST                                   |  2 +-
 config/cmake/HDFFortranCompilerFlags.cmake | 10 +++++-----
 config/gnu-fflags                          |  8 ++++----
 config/gnu-warnings/developer-gfort-5      |  1 +
 config/gnu-warnings/gfort-5                |  1 -
 configure.ac                               |  1 +
 6 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 config/gnu-warnings/developer-gfort-5
 delete mode 100644 config/gnu-warnings/gfort-5

diff --git a/MANIFEST b/MANIFEST
index d8867f6..38f0eff 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -187,7 +187,7 @@
 ./config/gnu-warnings/general
 ./config/gnu-warnings/gfort-general
 ./config/gnu-warnings/gfort-4.8
-./config/gnu-warnings/gfort-5
+./config/gnu-warnings/developer-gfort-5
 ./config/gnu-warnings/gfort-6
 ./config/gnu-warnings/gfort-8
 ./config/gnu-warnings/no-cxx-developer-4.8
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
index 94c40aa..754259e 100644
--- a/config/cmake/HDFFortranCompilerFlags.cmake
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -79,7 +79,6 @@ if (NOT MSVC AND NOT MINGW)
   endif ()
 
   if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
-
     # Append more extra warning flags that only gcc 4.8+ knows about
     if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.8)
       ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.8")
@@ -91,10 +90,11 @@ if (NOT MSVC AND NOT MINGW)
     #endif ()
 
     # Append more extra warning flags that only gcc 5.x+ knows about
-    # do not include -Wuse-without-only
-    #if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0)
-    #  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-5")
-    #endif ()
+    if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0)
+      if (HDF5_ENABLE_DEV_WARNINGS)
+        ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-gfort-5")
+      endif ()
+    endif ()
 
     # Append more extra warning flags that only gcc 6.x+ knows about
     if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0)
diff --git a/config/gnu-fflags b/config/gnu-fflags
index ce12561..1333ce5 100644
--- a/config/gnu-fflags
+++ b/config/gnu-fflags
@@ -161,10 +161,10 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
 
     # gfortran 4.9 (nothing new)
 
-    # gfortran >= 5 (do not include -Wuse-without-only)
-    #if test $f9x_vers_major -ge 5; then
-    #    H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-5)"
-    #fi
+    # gfortran >= 5
+    if test $f9x_vers_major -ge 5; then
+        DEVELOPER_WARNING_FCFLAGS="$DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments developer-gfort-5)"
+    fi
 
     # gfortran >= 6
     if test $f9x_vers_major -ge 6; then
diff --git a/config/gnu-warnings/developer-gfort-5 b/config/gnu-warnings/developer-gfort-5
new file mode 100644
index 0000000..c5d3850
--- /dev/null
+++ b/config/gnu-warnings/developer-gfort-5
@@ -0,0 +1 @@
+-Wuse-without-only
diff --git a/config/gnu-warnings/gfort-5 b/config/gnu-warnings/gfort-5
deleted file mode 100644
index c5d3850..0000000
--- a/config/gnu-warnings/gfort-5
+++ /dev/null
@@ -1 +0,0 @@
--Wuse-without-only
diff --git a/configure.ac b/configure.ac
index 7665f8e..98c3dbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2302,6 +2302,7 @@ fi
 case "X-$DEV_WARNINGS" in
   X-yes)
     H5_CFLAGS="$H5_CFLAGS $DEVELOPER_WARNING_CFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $DEVELOPER_WARNING_FCFLAGS"
     AC_MSG_RESULT([yes])
     ;;
   X-no)
-- 
cgit v0.12


From fabdce56efbc0aed942770414bef36c9fd81c878 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Thu, 28 Oct 2021 07:49:28 -0500
Subject: Split dir create into separate macro (#1141)

* Split dir create into separate macro

* Correct VFD settings
---
 c++/test/CMakeVFDTests.cmake            |  1 +
 config/cmake/ConfigureChecks.cmake      |  2 +-
 config/cmake/HDF5Macros.cmake           |  3 +++
 test/CMakeLists.txt                     | 42 +++++++++++++++++----------------
 test/CMakeVFDTests.cmake                |  1 +
 testpar/CMakeVFDTests.cmake             |  1 +
 tools/test/h5dump/CMakeVFDTests.cmake   |  1 +
 tools/test/h5repack/CMakeVFDTests.cmake |  1 +
 8 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake
index 4f3d137..ced9b0c 100644
--- a/c++/test/CMakeVFDTests.cmake
+++ b/c++/test/CMakeVFDTests.cmake
@@ -15,6 +15,7 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
+H5_CREATE_VFD_DIR()
 
 ##############################################################################
 ##############################################################################
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 263cedf..7b9d603 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -195,7 +195,7 @@ endif ()
 # Header-check flags set in config/cmake_ext_mod/ConfigureChecks.cmake
 # ----------------------------------------------------------------------
 option (HDF5_ENABLE_MIRROR_VFD "Build the Mirror Virtual File Driver" OFF)
-if (H5FD_ENABLE_MIRROR_VFD)
+if (HDF5_ENABLE_MIRROR_VFD)
   if ( ${HDF_PREFIX}_HAVE_NETINET_IN_H AND
        ${HDF_PREFIX}_HAVE_NETDB_H      AND
        ${HDF_PREFIX}_HAVE_ARPA_INET_H  AND
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 1a0e8b3..8b8b334 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -93,7 +93,10 @@ macro (H5_SET_VFD_LIST)
   if (H5_HAVE_WINDOWS)
     set (VFD_LIST ${VFD_LIST} windows)
   endif ()
+endmacro ()
 
+# Initialize the list of VFDs to be used for testing and create a test folder for each VFD
+macro (H5_CREATE_VFD_DIR)
   foreach (vfdtest ${VFD_LIST})
     file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
   endforeach ()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 37e6af6..4e543fd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -555,9 +555,9 @@ if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TEST_thread_id_FORMAT thread_id)
 endif ()
 
-if (HDF5_BUILD_UTILS)
-#-- Adding test for mirror_vfd
-add_executable (mirror_vfd ${mirror_vfd_SOURCES})
+if (HDF5_BUILD_UTILS) # requires mirror server
+  #-- Adding test for mirror_vfd
+  add_executable (mirror_vfd ${mirror_vfd_SOURCES})
   target_include_directories (mirror_vfd PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   if (NOT BUILD_SHARED_LIBS)
     TARGET_C_PROPERTIES (mirror_vfd STATIC)
@@ -752,24 +752,26 @@ if (HDF5_ENABLE_FORMATTERS)
   clang_format (HDF5_TEST_use_append_chunk_FORMAT use_append_chunk)
 endif ()
 
-set (use_append_chunk_mirror_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_append_chunk_mirror.c ${HDF5_TEST_SOURCE_DIR}/use_common.c ${HDF5_TEST_SOURCE_DIR}/use.h)
-add_executable (use_append_chunk_mirror ${use_append_chunk_mirror_SOURCES})
-target_compile_options(use_append_chunk_mirror PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-target_include_directories (use_append_chunk_mirror PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-if (NOT BUILD_SHARED_LIBS)
-  TARGET_C_PROPERTIES (use_append_chunk_mirror STATIC)
-  target_link_libraries (use_append_chunk_mirror PRIVATE ${HDF5_TEST_LIB_TARGET})
-else ()
-  TARGET_C_PROPERTIES (use_append_chunk_mirror SHARED)
-  target_link_libraries (use_append_chunk_mirror PRIVATE ${HDF5_TEST_LIBSH_TARGET})
-endif ()
-set_target_properties (use_append_chunk_mirror PROPERTIES FOLDER test)
+if (HDF5_BUILD_UTILS) # requires mirror server
+  set (use_append_chunk_mirror_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_append_chunk_mirror.c ${HDF5_TEST_SOURCE_DIR}/use_common.c ${HDF5_TEST_SOURCE_DIR}/use.h)
+  add_executable (use_append_chunk_mirror ${use_append_chunk_mirror_SOURCES})
+  target_compile_options(use_append_chunk_mirror PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  target_include_directories (use_append_chunk_mirror PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (use_append_chunk_mirror STATIC)
+    target_link_libraries (use_append_chunk_mirror PRIVATE ${HDF5_TEST_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (use_append_chunk_mirror SHARED)
+    target_link_libraries (use_append_chunk_mirror PRIVATE ${HDF5_TEST_LIBSH_TARGET})
+  endif ()
+  set_target_properties (use_append_chunk_mirror PROPERTIES FOLDER test)
 
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
-if (HDF5_ENABLE_FORMATTERS)
-  clang_format (HDF5_TEST_use_append_chunk_mirror_FORMAT use_append_chunk_mirror)
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_TEST_use_append_chunk_mirror_FORMAT use_append_chunk_mirror)
+  endif ()
 endif ()
 
 set (use_append_mchunks_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_append_mchunks.c ${HDF5_TEST_SOURCE_DIR}/use_common.c ${HDF5_TEST_SOURCE_DIR}/use.h)
diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index 130b0bf..e08e4d2 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -16,6 +16,7 @@
 ##############################################################################
 ##############################################################################
 # included from CMakeTests.cmake
+H5_CREATE_VFD_DIR()
 
 # create more test folders for each VFD
 foreach (vfdtest ${VFD_LIST})
diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake
index 12df1e9..d6a4025 100644
--- a/testpar/CMakeVFDTests.cmake
+++ b/testpar/CMakeVFDTests.cmake
@@ -15,6 +15,7 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
+H5_CREATE_VFD_DIR()
 
 set (H5P_VFD_TESTS
     t_pflush1
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index b6e0bea..7ab8c1f 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -15,6 +15,7 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
+H5_CREATE_VFD_DIR()
 
 # --------------------------------------------------------------------
 # Copy all the HDF5 files from the source directory into the test directory
diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake
index e50414f..f8ac10b 100644
--- a/tools/test/h5repack/CMakeVFDTests.cmake
+++ b/tools/test/h5repack/CMakeVFDTests.cmake
@@ -15,6 +15,7 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
+H5_CREATE_VFD_DIR()
 
 ##############################################################################
 ##############################################################################
-- 
cgit v0.12


From 9e0f68b967f3e28b6d052ccc45556aedae616d7a Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Fri, 29 Oct 2021 08:13:21 -0500
Subject: correct error checking string (#1143)

* fixed missed closing of a dataset

* fixed missed closing of a dataset

* fixed typo in error return

* Committing clang-format changes

* minor edits

* code format

* Committing clang-format changes

* code format

* minor edit

* switched from using MPI_count, to actual bytes written for H5FD_mpio_debug rw debugging

* Committing clang-format changes

* changed size_i in printf to reflect the I/O.

* Committing clang-format changes

* Fixed seg fault with xlf on BE with -qintsize=8

* fixed error function string

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 fortran/test/tH5A.F90 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fortran/test/tH5A.F90 b/fortran/test/tH5A.F90
index 4d56bed..d5ce9a2 100644
--- a/fortran/test/tH5A.F90
+++ b/fortran/test/tH5A.F90
@@ -408,13 +408,13 @@ CONTAINS
      !open the INTEGER attrbute by name
      !
      CALL h5aopen_name_f(dset_id, aname5, attr5_id, error)
-     CALL check("h5aopen_idx_f",error,total_error)
+     CALL check("h5aopen_name_f",error,total_error)
 
      !
      !open the NULL attrbute by name
      !
      CALL h5aopen_name_f(dset_id, aname6, attr6_id, error)
-     CALL check("h5aopen_idx_f",error,total_error)
+     CALL check("h5aopen_name_f",error,total_error)
 
      !
      !get the attrbute name
-- 
cgit v0.12


From 7ef6f7b6f84a39e440be59c4607e7cd84e6007bb Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Fri, 29 Oct 2021 17:41:04 -0500
Subject: Set the plugin path to the library default (#1144)

---
 config/cmake/HDF5_Examples.cmake.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in
index 5b7262e..db638fd 100644
--- a/config/cmake/HDF5_Examples.cmake.in
+++ b/config/cmake/HDF5_Examples.cmake.in
@@ -94,6 +94,8 @@ else()
   set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
   set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
 endif()
+### default HDF5_PLUGIN_PATH to where the filter libraries are located
+set(ENV{HDF5_PLUGIN_PATH} "${INSTALLDIR}/lib/plugin")
 if(${CDASH_LOCAL})
   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
 endif()
-- 
cgit v0.12


From 4aad0feb3493cd3f6196ee6471bcaefbfc863bef Mon Sep 17 00:00:00 2001
From: "H. Joe Lee" <hyoklee@hdfgroup.org>
Date: Tue, 2 Nov 2021 14:22:01 -0500
Subject: OESS-168: Remove clang warnings. (#1127)

* OESS-168: Remove clang warnings.

* OESS-168: Address @lrknox clang-format review.
---
 src/H5FDcore.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index ce96582..4b79de7 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -190,9 +190,9 @@ static const H5FD_class_t H5FD_core_g = {
 };
 
 /* Default configurations, if none provided */
-static const H5FD_core_fapl_t H5FD_core_default_config_g       = {H5_MB, TRUE, H5FD_CORE_WRITE_TRACKING_FLAG,
-                                                            H5FD_CORE_WRITE_TRACKING_PAGE_SIZE};
-static const H5FD_core_fapl_t H5FD_core_default_paged_config_g = {H5_MB, TRUE, TRUE, (size_t)4096};
+static const H5FD_core_fapl_t H5FD_core_default_config_g = {
+    (size_t)H5_MB, TRUE, H5FD_CORE_WRITE_TRACKING_FLAG, H5FD_CORE_WRITE_TRACKING_PAGE_SIZE};
+static const H5FD_core_fapl_t H5FD_core_default_paged_config_g = {(size_t)H5_MB, TRUE, TRUE, (size_t)4096};
 
 /* Define a free list to manage the region type */
 H5FL_DEFINE(H5FD_core_region_t);
@@ -398,7 +398,7 @@ H5FD__core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size)
                         "write to backing store failed: time = %s, filename = '%s', file descriptor = %d, "
                         "errno = %d, error message = '%s', ptr = %p, total write size = %llu, bytes this "
                         "sub-write = %llu, bytes actually written = %llu, offset = %llu",
-                        HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno), ptr,
+                        HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno), (void *)ptr,
                         (unsigned long long)size, (unsigned long long)bytes_in,
                         (unsigned long long)bytes_wrote, (unsigned long long)offset);
         } /* end if */
@@ -952,8 +952,8 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
                             "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
                             "error message = '%s', file->mem = %p, total read size = %llu, bytes this "
                             "sub-read = %llu, bytes actually read = %llu, offset = %llu",
-                            HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno), file->mem,
-                            (unsigned long long)size, (unsigned long long)bytes_in,
+                            HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno),
+                            (void *)file->mem, (unsigned long long)size, (unsigned long long)bytes_in,
                             (unsigned long long)bytes_read, (unsigned long long)offset);
                     } /* end if */
 
-- 
cgit v0.12


From ed3584ecc68fa4281f5ba01fcd175ce174b32221 Mon Sep 17 00:00:00 2001
From: "H. Joe Lee" <hyoklee@hdfgroup.org>
Date: Tue, 2 Nov 2021 14:22:45 -0500
Subject: OESS-168: Remove clang warnings. (#1135)

---
 test/testmeta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/testmeta.c b/test/testmeta.c
index c59c6cb..7cb3000 100644
--- a/test/testmeta.c
+++ b/test/testmeta.c
@@ -195,7 +195,7 @@ main(void)
 
             start[0] = 0;
             status   = H5Sselect_hyperslab(memspace_id, H5S_SELECT_SET, start, stride, count, NULL);
-            start[0] = (hssize_t)j;
+            start[0] = (hsize_t)j;
             status   = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET, start, stride, count, NULL);
             status   = H5Dwrite(dataset_id, type_id, memspace_id, dataspace_id, H5P_DEFAULT, &floatval);
             if (status < 0) {
-- 
cgit v0.12


From 60ed6c0df43205de7b3cad9e3b8a115c108abdeb Mon Sep 17 00:00:00 2001
From: "H. Joe Lee" <hyoklee@hdfgroup.org>
Date: Tue, 2 Nov 2021 14:24:14 -0500
Subject: OESS-168: Remove clang warnings. (#1146)

---
 test/tvlstr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/tvlstr.c b/test/tvlstr.c
index 7e47c7b..68f6124 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -293,7 +293,7 @@ test_vlstrings_special(void)
     /* Check data read in */
     for (i = 0; i < SPACE1_DIM1; i++)
         if (rdata[i] != NULL)
-            TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n", (int)i, rdata[i]);
+            TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", (int)i, rdata[i]);
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
@@ -352,7 +352,7 @@ test_vlstrings_special(void)
     /* Check data read in */
     for (i = 0; i < SPACE1_DIM1; i++)
         if (rdata[i] != NULL)
-            TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n", (int)i, rdata[i]);
+            TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", (int)i, rdata[i]);
 
     /* Try to write nil strings to disk. */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata2);
@@ -365,7 +365,7 @@ test_vlstrings_special(void)
     /* Check data read in */
     for (i = 0; i < SPACE1_DIM1; i++)
         if (rdata[i] != NULL)
-            TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n", (int)i, rdata[i]);
+            TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", (int)i, rdata[i]);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-- 
cgit v0.12