@@ -16,6 +16,7 @@

   Minor improvements:
+  * m1test script can invoke `hrecord' differently.

diff --git a/changelog b/changelog
index f633d191c37b026d3c8a3d6b0e45ead26cdbdc1e..174733b18669c2e426439cf4b25f9452532d91c5 100644 (file)
--- 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.
   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 c1500e7397026576885332adaa52a66c33f6ef9b..81b46345a4b00f11148941fc86ac9eb7a82a905c 100755 (executable)
--- a/regress/m1test
+++ b/regress/m1test
@@ -27,17 +27,25 @@ set -e
 
 if [ $# -lt 3 ]
 then
 
 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
 
        exit 1
 fi
 
 case="case-$1"; shift
 initfile="$1"; shift
 

+hrecord="./hrecord"
+

 case "$1" in
 -*)    initflags="$1"; shift
 esac
 
 case "$1" in
 -*)    initflags="$1"; shift
 esac
 

+case "$1" in
+=*)    hrecord="`echo \"$1\" | sed -e 's/^=//'`"; shift
+esac
+

 queryargs="$*"
 
 initstring="`cat init-$initfile.text`"
 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 \
 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
 
 rc=$?
 set -e