+ Bugfixes:

[adns.git] / regress / r1test

diff --git a/regress/r1test b/regress/r1test
index 142ef19046c0c1c190d43303d372657a08a52120..4315bf8a77699f65b51400b6bf63f2e6101d2745 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -17,6 +17,9 @@ initstring="`cat init-$initfile.text`"
 
 rm -f $ocase.*
 
+EF_DISABLE_BANNER=1
+export EF_DISABLE_BANNER
+
 set +e
 ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
  ./hplayback $initflags "/$initstring" $queryargs
@@ -39,13 +42,20 @@ do
        then
                :
        else
-               failed=true
+               failwhy="$failwhy WRONG OUTPUT"
        fi
 done
 
-if $failed
+cat >"$ocase.leftover"
+if egrep . /dev/null "$ocase.leftover"
+then
+       failwhy="$failwhy EXITED EARLY"
+fi
+
+if [ "x$failwhy" != x ]
 then
-       echo >&2 "FAILED $case - WRONG OUTPUT - lines of syscall remaining `wc -l`"
+       scremain="`wc -l <\"$ocase.leftover\"`"
+       echo >&2 "FAILED $case -$failwhy - lines of syscall remaining $scremain"
        mrc=2
        exit
 fi