X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fm1test;h=82e94caba6cc2d0929084ad118c90395962f1a13;hp=b70cde2d3b5f2d6317c6dfeefa5ff4dad3452ff5;hb=15206d5a9435c871df171cce804e3161ec35dfe1;hpb=39196d5f5abd0559b60ea2dcdaa6f37dde9d9fd9

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