X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fm1test;h=82e94caba6cc2d0929084ad118c90395962f1a13;hp=361e5b17106d5a274dcfaf9ad3c3306d385eab37;hb=8b1171e6b5eb5524958f1876e2753f5b75a26cfd;hpb=12c5b204145993a34b92ac2b7de5ebcebb6d2d15

diff --git a/regress/m1test b/regress/m1test
index 361e5b1..82e94ca 100755
--- a/regress/m1test
+++ b/regress/m1test
@@ -1,16 +1,35 @@
 #!/bin/sh
-# usage: m1test <name> <initfile> <queryargs>
 
 set -e
-tcn="$1"
-initfile="$2"
+
+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="$*"
-test -d ../testcases || cd testcases
 
-initstring="`cat $initfile.init`"
+initstring="`cat init-$initfile.text`"
+
+echo $initfile $initflags >"$case.sys"
+echo "$queryargs" >>"$case.sys"
+
+echo running hrecord $initflags "/... $queryargs"
+set +e
+ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.out" 2>"$case.err" </dev/null \
+ ./hrecord $initflags "/$initstring" $queryargs
+rc=$?
+set -e
 
-exec >$tcn.log
-echo "$initfile"
-echo "$queryargs"
+echo "rc=$rc" >>$case.out
 
-H../hrecord "/$initstring" $queryargs
+egrep . -- "$case.err" "$case.out"
+echo "exit status: $rc"