From daf2b836eeec857b2de4d70bc58abeb16d25eee0 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Wed, 9 Oct 2019 11:04:15 -0500
Subject: Final improvements.

---
 tools/test/h5dump/testh5dump.sh.in | 53 +++++++++++---------------------------
 1 file changed, 15 insertions(+), 38 deletions(-)

diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index f920b9c..de0c1e0 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -906,12 +906,14 @@ TOOLTEST_HELP() {
 }
 
 # Call the h5dump tool and grep for a value
-#
+# txttype ERRTXT greps test error output, otherwise greps test output
 GREPTEST()
 {
-    expectdata=$1
-    actual=$TESTDIR/$2
-    actual_err="$TESTDIR/`basename $2 .ddl`.oerr"
+    txttype=$1
+    expectdata=$2
+    actual=$TESTDIR/$3
+    actual_err="$TESTDIR/`basename $3 .ddl`.oerr"
+    shift
     shift
     shift
 
@@ -921,37 +923,11 @@ GREPTEST()
       cd $TESTDIR
       $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
     ) >$actual 2>$actual_err
-    $GREP $expectdata $actual > /dev/null
-    if [ $? -eq 0 ]; then
-        echo " PASSED"
+    if [[ "$txttype" = "ERRTXT" ]]; then
+        $GREP "$expectdata" $actual_err > /dev/null
     else
-        echo " FAILED"
-        nerrors="`expr $nerrors + 1`"
+        $GREP "$expectdata" $actual > /dev/null
     fi
-
-    # Clean up output file
-    if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err
-    fi
-}
-
-# Call the h5dump tool and grep for an error string 
-#
-GREPERRTEST()
-{
-    expectdata=$1
-    actual=$TESTDIR/$2
-    actual_err="$TESTDIR/`basename $2 .ddl`.oerr"
-    shift
-    shift
-
-    # Run test.
-    TESTING $DUMPER -p $@
-    (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
-    ) >$actual 2>$actual_err
-    $GREP "$expectdata" $actual_err > /dev/null
     if [ $? -eq 0 ]; then
         echo " PASSED"
     else
@@ -961,8 +937,9 @@ GREPERRTEST()
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err
+        rm -f $actual $actual_err
     fi
+
 }
 
 # Print a "SKIP" message
@@ -1167,7 +1144,7 @@ TOOLTEST tvlenstr_array.ddl --enable-error-stack tvlenstr_array.h5
 # test for files with array data
 TOOLTEST tarray1.ddl --enable-error-stack tarray1.h5
 # # added for bug# 2092 - tarray1_big.h
-TOOLTEST4 tarray1_big.ddl --enable-error-stack -R tarray1_big.h5
+GREPTEST ERRTXT "Undefined reference pointer" tarray1_big.ddl --enable-error-stack -R tarray1_big.h5
 TOOLTEST tarray2.ddl --enable-error-stack tarray2.h5
 TOOLTEST tarray3.ddl --enable-error-stack tarray3.h5
 TOOLTEST tarray4.ddl --enable-error-stack tarray4.h5
@@ -1375,9 +1352,9 @@ fi
 
 # test for dataset region references
 TOOLTEST  tdatareg.ddl --enable-error-stack tdatareg.h5
-TOOLTEST4 tdataregR.ddl --enable-error-stack -R tdatareg.h5
+GREPTEST ERRTXT "Undefined reference pointer" tdataregR.ddl --enable-error-stack -R tdatareg.h5
 TOOLTEST  tattrreg.ddl --enable-error-stack tattrreg.h5
-TOOLTEST4 tattrregR.ddl --enable-error-stack -R tattrreg.h5
+GREPTEST ERRTXT "Undefined reference pointer" tattrregR.ddl --enable-error-stack -R tattrreg.h5
 TOOLTEST2 tbinregR.exp --enable-error-stack -d /Dataset1 -s 0 -R -y -o tbinregR.txt    tdatareg.h5
 
 # Clean up text output files
@@ -1426,7 +1403,7 @@ TOOLTEST3 non_existing.ddl --enable-error-stack tgroup.h5 non_existing.h5
 TOOLTEST err_attr_dspace.ddl err_attr_dspace.h5
 
 # test to verify HDFFV-9407: long double full precision
-GREPTEST "1.123456789012345" t128bit_float.ddl -m %.35Lf t128bit_float.h5
+GREPTEST OUTTXT "1.123456789012345" t128bit_float.ddl -m %.35Lf t128bit_float.h5
 
 # Clean up temporary files/directories
 CLEAN_TESTFILES_AND_TESTDIR
-- 
cgit v0.12