Modified to allow pass/fail tolerance to be passed from runtest.sh call

src/test/TEST_struct/pfmgvcycle.sh

@@ -16,7 +16,14 @@
 
 
 TNAME=`basename $0 .sh`
+CONVTOL=$1
 
+# Set default check tolerance
+if [ x$CONVTOL = "x" ]; 
+then
+    CONVTOL=0.0
+fi
+#echo "tol = $CONVTOL"
 #=============================================================================
 # compare with baseline case
 #=============================================================================
@@ -41,7 +48,8 @@ if [ "$OUT_COUNT" != "$SAVED_COUNT" ]; then
 fi
 
 if [ -z $HYPRE_NO_SAVED ]; then
-   diff -U3 -bI"time" ${TNAME}.saved ${TNAME}.out >&2
+#   diff -U3 -bI"time" ${TNAME}.saved ${TNAME}.out >&2
+   (../runcheck.sh ${TNAME}.out ${TNAME}.saved $CONVTOL)
 fi
 
 #=============================================================================

src/test/runcheck.sh

@@ -14,17 +14,14 @@
 # ./runcheck.sh fname.out fname.saved 1.0e-6
 
 FNAME=$1
-#TNAME=`basename $1 .out`
-#SNAME=${TNAME}.saved
 SNAME=$2
 CONVTOL=$3
 
 if [ x$CONVTOL = "x" ]; 
 then
-    CONVTOL=1.0e-6
+    CONVTOL=0.0
 fi
-
-#echo $CONVTOL
+#echo "runcheck tol = $CONVTOL"
 
 PASSFAIL=$(awk -v filename="$SNAME" 'BEGIN{{FS=" "}
 
@@ -89,5 +86,4 @@ if [ x$PASSFAIL != "x" ];
 then
 #    echo $PASSFAIL
      diff -U3 -bI"time" $SNAME $FNAME >&2
-#     diff -U3 -bI"time" ${TNAME}.saved ${TNAME}.out >&2
 fi

src/test/runtest.sh

@@ -390,10 +390,11 @@ function ExecuteTest
    StartDir=$1
    WorkingDir=$2
    InputFile=$3
+   CONVTOL=$4
    SavePWD=`pwd`
    cd $WorkingDir
    (cat $InputFile.err.* > $InputFile.err)
-   (./$InputFile.sh     >> $InputFile.err 2>> $InputFile.err)
+   (./$InputFile.sh $CONVTOL   >> $InputFile.err 2>> $InputFile.err)
    cd $SavePWD
 }
 
@@ -464,7 +465,8 @@ function StartCrunch
 #==========================================================================
 
 # main
-
+# Set default check tolerance
+CONVTOL=0.0
 while [ "$*" ]
 do
    case $1 in
@@ -491,6 +493,11 @@ do
          eval export `echo $1`=1
          shift
          ;;
+      -tol)
+         shift
+         CONVTOL=$1
+         shift
+         ;;
       *) InputString=$1
          if [ "$InputString" ] ; then
             if [ -r $InputString ] ; then
@@ -513,7 +520,7 @@ do
                      ;;
                esac
                if [ -r $DirPart/$FilePart.jobs ] ; then
-                  StartCrunch $CurDir $DirPart $FilePart
+                  StartCrunch $CurDir $DirPart $FilePart $CONVTOL
                else
                   printf "%s: test command file %s/%s.jobs does not exist\n" \
                      $0 $DirPart $FilePart