Merge remote-tracking branch 'upstream/feature/vfd_swmr' into feature/vfd_swmr

1 files changed, 38 insertions, 37 deletions

diff --git a/test/testvfdswmr.sh.in b/test/testvfdswmr.sh.in
index 19d5ae0..146523c 100644
--- a/test/testvfdswmr.sh.in
+++ b/test/testvfdswmr.sh.in
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 #
 # Copyright by The HDF Group.
 # Copyright by the Board of Trustees of the University of Illinois.
@@ -46,7 +46,7 @@ nsofterrors=0		# soft errors are expected to occur some of the time
 ## 1:  Default run.
 ## 2+: Quick run
 ###############################################################################
-if [ -z $HDF5TestExpress ]; then    # Set to default when not set
+if [[ -z $HDF5TestExpress ]]; then    # Set to default when not set
     HDF5TestExpress=1
 fi
 ##
@@ -625,12 +625,13 @@ fi
 
 # attrdset test
 for options in "-p -g -a 10 -v -m -d 10 -c 3 -u 5" "-k -a 20 -v -m -d 5"; do
-	#
-	# Test a few big datasets of one and two dimensions.
-	#
-	if [ ${do_attrdset:-no} = no ]; then
-		continue
-	fi
+    #
+    # Test a few big datasets of one and two dimensions.
+    #
+    if [ ${do_attrdset:-no} = no ]; then
+        continue
+    fi
+
     # Clean up any existing fifo files from previous runs
     if [ -e ./$FIFO_WRITER_TO_READER ]; then     # If writer fifo file is found
         rm -f ./$FIFO_WRITER_TO_READER
@@ -638,38 +639,38 @@ for options in "-p -g -a 10 -v -m -d 10 -c 3 -u 5" "-k -a 20 -v -m -d 5"; do
     if [ -e ./$FIFO_READER_TO_WRITER ]; then      # If reader fifo file is found
         rm -f ./$FIFO_READER_TO_WRITER
     fi
-    #
-	echo launch vfd_swmr_attrdset_writer attrdset, options $options
-	catch_out_err_and_rc vfd_swmr_attrdset_writer \
-	    ../vfd_swmr_attrdset_writer $options &
-	pid_writer=$!
-
-	catch_out_err_and_rc vfd_swmr_attrdset_reader \
-	    ../vfd_swmr_attrdset_reader $options &
-	pid_reader=$!
-
-	# Wait for the reader to finish before signaling the
-	# writer to quit: the writer holds the file open so that the
-	# reader will find the shadow file when it opens
-	# the .h5 file.
-	wait $pid_reader
-	wait $pid_writer
 
-	# Collect exit code of the reader
-	if [ $(cat vfd_swmr_attrdset_reader.rc) -ne 0 ]; then
-		echo reader had error
-		nerrors=$((nerrors + 1))
-	fi
+    echo launch vfd_swmr_attrdset_writer attrdset, options $options
+    catch_out_err_and_rc vfd_swmr_attrdset_writer \
+        ../vfd_swmr_attrdset_writer $options &
+    pid_writer=$!
+
+    catch_out_err_and_rc vfd_swmr_attrdset_reader \
+        ../vfd_swmr_attrdset_reader $options &
+    pid_reader=$!
+
+    # Wait for the reader to finish before signaling the
+    # writer to quit: the writer holds the file open so that the
+    # reader will find the shadow file when it opens
+    # the .h5 file.
+    wait $pid_reader
+    wait $pid_writer
+
+    # Collect exit code of the reader
+    if [ $(cat vfd_swmr_attrdset_reader.rc) -ne 0 ]; then
+        echo reader had error
+        nerrors=$((nerrors + 1))
+    fi
 
-	# Collect exit code of the writer
-	if [ $(cat vfd_swmr_attrdset_writer.rc) -ne 0 ]; then
-	    echo writer had error
-	    nerrors=$((nerrors + 1))
-	fi
+    # Collect exit code of the writer
+    if [ $(cat vfd_swmr_attrdset_writer.rc) -ne 0 ]; then
+        echo writer had error
+        nerrors=$((nerrors + 1))
+    fi
 
-	# Clean up output files
-	rm -f vfd_swmr_attrdset_writer.{out,rc}
-	rm -f vfd_swmr_attrdset_reader.*.{out,rc}
+    # Clean up output files
+    rm -f vfd_swmr_attrdset_writer.{out,rc}
+    rm -f vfd_swmr_attrdset_reader.*.{out,rc}
 done
 
 #