From 9c52782f9d6ff4f8148cf4c691d582643bf34bb8 Mon Sep 17 00:00:00 2001
From: wkliao <wkliao@users.noreply.github.com>
Date: Tue, 19 Sep 2023 18:06:26 -0500
Subject: [PATCH] disable tests in examples/hdf5_examples for Cache VOL as it
 now requires MPI_Init_thread

---
 examples/hdf5_examples/parallel_run.sh |  2 +-
 examples/hdf5_examples/seq_runs.sh     | 11 +++--------
 tests/common/wrap_runs.sh              | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/examples/hdf5_examples/parallel_run.sh b/examples/hdf5_examples/parallel_run.sh
index 2928bd58..a19af344 100755
--- a/examples/hdf5_examples/parallel_run.sh
+++ b/examples/hdf5_examples/parallel_run.sh
@@ -9,7 +9,7 @@ RUN_CMD=`echo ${TESTMPIRUN} | ${SED} -e "s/NP/$1/g"`
 
 . $srcdir/../../tests/common/wrap_runs.sh
 
-log_vol_file_only=1
+log_vol_file_only=0
 
 # These example programs downloaded from HDF5 repo CANNOT run the second time,
 # because some programs add the same attributes to the files created by other
diff --git a/examples/hdf5_examples/seq_runs.sh b/examples/hdf5_examples/seq_runs.sh
index 781a9f12..eb6f592c 100755
--- a/examples/hdf5_examples/seq_runs.sh
+++ b/examples/hdf5_examples/seq_runs.sh
@@ -22,14 +22,9 @@ test_example_func() {
    export H5VL_LOG_PASSTHRU=1
 
    if test "x$cache_vol" = xyes || test "x$async_vol" = xyes ; then
-      if test "x$cache_vol" = xyes ; then
-         if test "x$async_vol" = xyes ; then
-            echo "---- Run Log + Cache + Async VOLs -------------"
-         else
-            echo "---- Run Log + Cache VOLs ---------------------"
-         fi
-      fi
-      run_func $1 $log_vol_file_only $2 $3
+      # Skip as Async I/O VOL requires to call MPI_Init_thread()
+      # Skip as Cache VOL requires to call MPI_Init_thread()
+      return
    elif test "x$log_vol" = xyes ; then
       echo "---- Run Log VOL as a passthrough connector ---------------------"
       run_func $1 $log_vol_file_only $2 $3
diff --git a/tests/common/wrap_runs.sh b/tests/common/wrap_runs.sh
index f64e2ff5..064a6981 100755
--- a/tests/common/wrap_runs.sh
+++ b/tests/common/wrap_runs.sh
@@ -118,10 +118,21 @@ test_func() {
          else
             echo "--- Run Log + Cache VOLs -----------------------------------------------"
          fi
+      else
+         echo "  - Run Log + Async VOLs ---------------------------------------"
       fi
       # When stacking Log on top of other VOLs, we can only run Log as passthru
       export H5VL_LOG_PASSTHRU=1
-      run_func $1 $log_vol_file_only $2 $3
+      isLogFile=0
+      if test "x$TEST_NATIVE_VOL_ONLY" != x1 && test "x$HDF5_VOL_CONNECTOR" = x ; then
+         isLogFile=1
+      elif test "x$log_vol" = xyes ; then
+         isLogFile=1
+      fi
+echo "  - TEST_NATIVE_VOL_ONLY=$TEST_NATIVE_VOL_ONLY ---------------------------------------"
+echo "  - HDF5_VOL_CONNECTOR=$HDF5_VOL_CONNECTOR ---------------------------------------"
+echo "  - isLogFile=$isLogFile ---------------------------------------"
+      run_func $1 $isLogFile $2 $3
    elif test "x$log_vol" = xyes ; then
       # test when Log is passthru
       echo "  - Run Log VOL as a passthrough connector -----------------------------"