X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/e9d74277f1c1262b5d8daf80b665e98c25b6dc37..4ac3336eca2d301117e9a5ede8573005a52a1559:/regress/m1test

diff --git a/regress/m1test b/regress/m1test
index e88933e..dbd6bc5 100755
--- a/regress/m1test
+++ b/regress/m1test
@@ -1,23 +1,38 @@
 #!/bin/sh
-# usage: m1test <name> <initfile> <queryargs>
 
 set -e
+
+if [ $# -lt 3 ]
+then
+	echo >&2 'usage: m1test <name> <initfile> [<initflags>] <queryargs>'
+	exit 1
+fi
+
 case="case-$1"; shift
 initfile="$1"; shift
+
+case "$1" in
+-*)	initflags="$1"; shift
+esac
+
 queryargs="$*"
 
 initstring="`cat init-$initfile.text`"
 
-echo "$initfile" >"$case.sys"
+echo $initfile $initflags >"$case.sys"
 echo "$queryargs" >>"$case.sys"
 
-echo running "hrecord /... $queryargs"
+EF_DISABLE_BANNER=1
+export EF_DISABLE_BANNER
+
+echo running hrecord $initflags "/... $queryargs"
 set +e
-ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.stdout" 2>"$case.stderr" </dev/null \
- ./hrecord "/$initstring" $queryargs
+ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.out" 2>"$case.err" </dev/null \
+ ./hrecord $initflags "/$initstring" $queryargs
 rc=$?
 set -e
 
-egrep . -- "$case.stderr" "$case.stdout"
+echo "rc=$rc" >>$case.out
+
+egrep . -- "$case.err" "$case.out"
 echo "exit status: $rc"
-exit $rc