X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/39196d5f5abd0559b60ea2dcdaa6f37dde9d9fd9..1671459cd4ce35f55431e2014199da8a7a68b2c4:/regress/m1test

diff --git a/regress/m1test b/regress/m1test
index b70cde2..dbd6bc5 100755
--- a/regress/m1test
+++ b/regress/m1test
@@ -1,29 +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 "exit status: $rc"
-
-if test $rc = 0
-then
-	echo "test created ok"
-fi
+echo "rc=$rc" >>$case.out
 
-exit $rc
+egrep . -- "$case.err" "$case.out"
+echo "exit status: $rc"