HDFFV-10903 merge dev changes to 1.10

1 files changed, 20 insertions, 11 deletions

diff --git a/test/test_usecases.sh.in b/test/test_usecases.sh.in
index 8bc2078..49868ca 100644
--- a/test/test_usecases.sh.in
+++ b/test/test_usecases.sh.in
@@ -40,7 +40,7 @@ fi
 # Define symbols
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
-EXIT_VALUE=$EXIT_SUCCESS	# Default all tests succeed
+EXIT_VALUE=$EXIT_SUCCESS    # Default all tests succeed
 RESULT_PASSED=" PASSED"
 RESULT_FAILED="*FAILED*"
 RESULT_SKIP="-SKIP-"
@@ -97,17 +97,17 @@ TOOLTEST() {
     cat $actual_err >> $actual
 
     if [ $exit_code -eq 0 ];then
-	echo "$RESULT_PASSED"
-	test yes = "$verbose" && sed 's/^/    /' < $actual
+    echo "$RESULT_PASSED"
+    test yes = "$verbose" && sed 's/^/    /' < $actual
     else
-	echo "$RESULT_FAILED"
-	nerrors="`expr $nerrors + 1`"
-	test yes = "$verbose" && sed 's/^/    /' < $actual
+    echo "$RESULT_FAILED"
+    nerrors="`expr $nerrors + 1`"
+    test yes = "$verbose" && sed 's/^/    /' < $actual
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+    rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
 }
 
@@ -122,7 +122,9 @@ for FILE in use_*; do
     case "$FILE" in
         *.o) continue ;;    ## don't copy the .o files
     esac
-    cp $FILE usecases_test
+    if test -f "$FILE" ; then
+        cp $FILE usecases_test
+    fi
 done
 
 # With the --disable-shared option, swmr program files are built in the test
@@ -131,7 +133,14 @@ done
 # always be copied, swmr files in .libs should be copied only if they exists.
 if [ -f .libs/use_append_chunk ]; then
     mkdir usecases_test/.libs
-    cp .libs/use_* usecases_test/.libs
+    for FILE in .libs/use_*; do
+        case "$FILE" in
+            *.o) continue ;;    ## don't copy the .o files
+        esac
+        if test -f "$FILE" ; then
+            cp $FILE usecases_test/.libs
+        fi
+    done
     cp .libs/twriteorder usecases_test/.libs
 fi
 
@@ -176,10 +185,10 @@ for p in $USECASES_PROGRAMS; do
     TOOLTEST ./$p -l w
     TOOLTEST ./$p -l r
     # use case 1.9, testing with multi-planes chunks
-    TOOLTEST ./$p -z 256 -y 5	# 5 planes chunks
+    TOOLTEST ./$p -z 256 -y 5    # 5 planes chunks
     # cleanup temp datafile
     if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $p.h5
+    rm -f $p.h5
     fi
 done