X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fm1test;h=81cd024fe6b6bc7e6fd2af7d95615b66aaa7af91;hb=9da4a044c4d2e0a960cf8f33c62774db02f4402d;hp=e88933e7167a2165c99b3aec268ed3802c0da63e;hpb=1c957fdadf0ab368ab1266fbd6a9ea8fbe3b271d;p=adns.git

diff --git a/regress/m1test b/regress/m1test
index e88933e..81cd024 100755
--- a/regress/m1test
+++ b/regress/m1test
@@ -1,7 +1,13 @@
 #!/bin/sh
-# usage: m1test <name> <initfile> <queryargs>
 
 set -e
+
+if [ $# -lt 3 ]
+then
+	echo >&2 'usage: m1test <name> <initfile> <queryargs>'
+	exit 1
+fi
+
 case="case-$1"; shift
 initfile="$1"; shift
 queryargs="$*"
@@ -13,11 +19,12 @@ echo "$queryargs" >>"$case.sys"
 
 echo running "hrecord /... $queryargs"
 set +e
-ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.stdout" 2>"$case.stderr" </dev/null \
+ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.out" 2>"$case.err" </dev/null \
  ./hrecord "/$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