Update selection IO branch with develop (HDFGroup#1215)

Merged branch 'develop' into selection_io
jhendersonHDF · Mar 31, 2022 · 13e86e8 · 13e86e8
1 parent b7a1511
commit 13e86e8
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 10 deletions.
diff --git a/src/H5.c b/src/H5.c
@@ -291,14 +291,6 @@ H5_init_library(void)
     }
     /* clang-format on */
 
-    /* Check for HDF5_USE_SELECTION_IO env variable */
-    env_use_select_io = HDgetenv("HDF5_USE_SELECTION_IO");
-    if (NULL != env_use_select_io && HDstrcmp(env_use_select_io, "") && HDstrcmp(env_use_select_io, "0") &&
-        HDstrcmp(env_use_select_io, "no") && HDstrcmp(env_use_select_io, "No") &&
-        HDstrcmp(env_use_select_io, "NO") && HDstrcmp(env_use_select_io, "false") &&
-        HDstrcmp(env_use_select_io, "False") && HDstrcmp(env_use_select_io, "FALSE"))
-        H5_use_selection_io_g = TRUE;
-
     /* Check for HDF5_USE_SELECTION_IO env variable */
     env_use_select_io = HDgetenv("HDF5_USE_SELECTION_IO");
     if (NULL != env_use_select_io && HDstrcmp(env_use_select_io, "") && HDstrcmp(env_use_select_io, "0") &&

diff --git a/src/H5FD.c b/src/H5FD.c
@@ -932,8 +932,7 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2)
 
     FUNC_ENTER_NOAPI_NOERR; /* return value is arbitrary */
 
-    if ((!f1 || !f1->cls) && (!f2 || !f2->cls))
-        HGOTO_DONE(0)
+        if ((!f1 || !f1->cls) && (!f2 || !f2->cls)) HGOTO_DONE(0)
     if (!f1 || !f1->cls)
         HGOTO_DONE(-1)
     if (!f2 || !f2->cls)

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -54,6 +54,10 @@ if MIRROR_VFD_CONDITIONAL
   TEST_SCRIPT += test_mirror.sh
 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
@@ -106,6 +110,10 @@ if MIRROR_VFD_CONDITIONAL
   check_PROGRAMS+= mirror_vfd
 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/test_flush_refresh.sh.in b/test/test_flush_refresh.sh.in
@@ -62,6 +62,16 @@ srcdir=@srcdir@
 utils_testdir=@abs_top_builddir@/@H5_UTILS_TEST_BUILDDIR@
 testdir=@abs_top_builddir@/@H5_TEST_BUILDDIR@
 
+# 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.
 $utils_testdir/swmr_check_compat_vfd

diff --git a/test/test_swmr.sh.in b/test/test_swmr.sh.in
@@ -95,6 +95,11 @@ WAIT_MESSAGE() {
 ##
 ###############################################################################
 
+# 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.
 $utils_testdir/swmr_check_compat_vfd

diff --git a/test/test_use_cases.sh.in b/test/test_use_cases.sh.in
@@ -38,6 +38,11 @@ srcdir=@srcdir@
 utils_testdir=@abs_top_builddir@/@H5_UTILS_TEST_BUILDDIR@
 testdir=@abs_top_builddir@/@H5_TEST_BUILDDIR@
 
+# 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.
 $utils_testdir/swmr_check_compat_vfd

diff --git a/test/test_vds_swmr.sh.in b/test/test_vds_swmr.sh.in
@@ -81,6 +81,11 @@ WAIT_MESSAGE() {
 ## Main
 ###############################################################################
 
+# 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.
 $utils_testdir/swmr_check_compat_vfd