X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fr1test;h=142ef19046c0c1c190d43303d372657a08a52120;hp=3b2bfdf15125a7d8f649228f22d582cd283da481;hb=15206d5a9435c871df171cce804e3161ec35dfe1;hpb=620c146da30a20c2d9a6c572fdd0540558039d0e

diff --git a/regress/r1test b/regress/r1test
index 3b2bfdf..142ef19 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,12 +2,15 @@
 # usage: r1test <testcasename>
 
 set -e
+mrc=1
+trap 'exit $mrc' 0
+
 casename="$1"
 case="case-$casename"
 ocase="output-$casename"
 
 exec <"$case.sys"
-read initfile
+read initfile initflags
 read queryargs
 
 initstring="`cat init-$initfile.text`"
@@ -16,10 +19,17 @@ rm -f $ocase.*
 
 set +e
 ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
- ./hplayback "/$initstring" $queryargs
+ ./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 +46,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