X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/8b1171e6b5eb5524958f1876e2753f5b75a26cfd..1671459cd4ce35f55431e2014199da8a7a68b2c4:/regress/r1test?ds=sidebyside

diff --git a/regress/r1test b/regress/r1test
index 4d10101..de8db69 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,6 +2,9 @@
 # usage: r1test <testcasename>
 
 set -e
+mrc=1
+trap 'exit $mrc' 0
+
 casename="$1"
 case="case-$casename"
 ocase="output-$casename"
@@ -14,12 +17,22 @@ 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
 rc=$?
 set -e
 
+if [ "$rc" = 5 ]
+then
+	echo -n "SKIPPED-$casename "
+	mrc=5
+	exit
+fi
+
 echo "rc=$rc" >>$ocase.out
 
 failed=false
@@ -36,9 +49,9 @@ done
 if $failed
 then
 	echo >&2 "FAILED $case - WRONG OUTPUT - lines of syscall remaining `wc -l`"
-	exit 2
+	mrc=2
+	exit
 fi
 
 echo -n "$casename "
-
-exit 0
+mrc=0