From: ian <ian>
Date: Tue, 27 Jun 2000 22:07:33 +0000 (+0000)
Subject: +  * m1test script can invoke `hrecord' differently.
X-Git-Tag: adns-1.5.0-rc0~246
X-Git-Url: https://git.distorted.org.uk/~mdw/adns/commitdiff_plain/e24e7155ee921f30b195b079d0e2d29bf268a354

+  * m1test script can invoke `hrecord' differently.

@@ -16,6 +16,7 @@
   Minor improvements:
+  * m1test script can invoke `hrecord' differently.
---

diff --git a/changelog b/changelog
index f633d19..174733b 100644
--- a/changelog
+++ b/changelog
@@ -16,6 +16,7 @@ adns (0.9) unstable; urgency=low
   Minor improvements:
   * Do not print warning if sendto() gives EAGAIN.
   * adnsresfilter default timeout changed to 1000ms.
+  * m1test script can invoke `hrecord' differently.
 
  --
 
diff --git a/regress/m1test b/regress/m1test
index c1500e7..81b4634 100755
--- a/regress/m1test
+++ b/regress/m1test
@@ -27,17 +27,25 @@ set -e
 
 if [ $# -lt 3 ]
 then
-	echo >&2 'usage: m1test <name> <initfile> [<initflags>] <queryargs>'
+	echo >&2 \
+'usage: m1test <name> <initfile> [<initflags>] [=<hrecord-command-args>]
+       <queryargs>'
 	exit 1
 fi
 
 case="case-$1"; shift
 initfile="$1"; shift
 
+hrecord="./hrecord"
+
 case "$1" in
 -*)	initflags="$1"; shift
 esac
 
+case "$1" in
+=*)	hrecord="`echo \"$1\" | sed -e 's/^=//'`"; shift
+esac
+
 queryargs="$*"
 
 initstring="`cat init-$initfile.text`"
@@ -51,7 +59,7 @@ export EF_DISABLE_BANNER
 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
+ $hrecord $initflags "/$initstring" $queryargs
 rc=$?
 set -e