Clean up output and change usage from echo to print

diff --git a/rtest/rtest.sh b/rtest/rtest.sh
index 3e6b77cb7d451ca1b54e6ad5d5fb834935a51e3f..f8228c8906d9d3587b6b03008f46337e4acb4818 100755 (executable)
--- a/rtest/rtest.sh
+++ b/rtest/rtest.sh
@@ -37,7 +37,7 @@ TESTNAME=   # name of test
 GRAPH=      # graph specification
 IDX=
 typeset -i i j SUBTESTCNT
-typeset -i CRASH_CNT DIFF_CNT TOT_CNT
+typeset -i CRASH_CNT=0 DIFF_CNT=0 TOT_CNT=0
 typeset -i LINECNT=0
 typeset -A TESTTYPES
 typeset -a ALG
@@ -311,7 +311,7 @@ function doTest
 
 trap 'rm -f $TMPFILE1 $TMPFILE2 $TMPINFILE errout; exit' 0 1 2 3 15
 
-Usage='rtest [-gvn] [TESTFILE]\n
+Usage=rrtest [-gvn] [TESTFILE]\n
  -g : generate test data\n
  -v : verbose\n
  -n : print test'
@@ -341,7 +341,7 @@ do
   \? )
     if [[ "$OPTARG" == '?' ]]
     then
-      echo $Usage
+      print $Usage
       exit 0
     else
       echo "rtest: unknown flag $OPTARG - ignored"
@@ -402,9 +402,12 @@ while readTest
 do
   doTest
 done
-if [[ $NOOP != 1 ]]
+if [[ $NOOP == 1 ]]
 then
-print -u 2 "No. tests: $TOT_CNT Layout failures: $CRASH_CNT Changes: $DIFF_CNT"
-else
 print -u 2 "No. tests: $TOT_CNT"
+elif [[ $GENERATE == 1 ]]
+then
+print -u 2 "No. tests: $TOT_CNT Layout failures: $CRASH_CNT"
+else
+print -u 2 "No. tests: $TOT_CNT Layout failures: $CRASH_CNT Changes: $DIFF_CNT"
 fi