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

diff --git a/regress/m1test b/regress/m1test
index e88933e..f7a28f0 100755
--- a/regress/m1test
+++ b/regress/m1test
@@ -1,23 +1,107 @@
-#!/bin/sh
-# usage: m1test <name> <initfile> <queryargs>
+#!/bin/bash
+# usage: m1test <name> <initfile> [<initflags>] <queryargs>'
+# test recording script
+#
+#  This file is
+#    Copyright (C) 1998-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
 set -e
+
+if [ $# -lt 3 ]
+then
+	echo >&2 \
+'usage: m1test <name> <initfile> [-<initflags>] ["<"]
+              [=<hrecord-command-args>] <queryargs>
+("<" means read input from case-<name>.in)'
+	exit 1
+fi
+
 case="case-$1"; shift
 initfile="$1"; shift
+
+hrecord="./adnstest_record"
+
+case "$1" in
+-*)	initflags="$1"; shift
+esac
+
+if test "x$1" = "x<"
+then
+	shift; exec <"$case.in"
+fi
+
+case "$1" in
+=*)	hrecord="`echo \"$1\" | sed -e 's/^=//'`"; shift
+esac
+
+if test ! -f "$hrecord" -a -f "${hrecord}_record"
+then
+	case "$hrecord" in
+	/*)	program="$hrecord"	;;
+	*)	program="./$hrecord"	;;
+	esac
+	hrecord="${program}_record"
+else
+	program="$(echo "$hrecord" | sed -e 's/ .*//; s/_record$//')"
+fi
+
 queryargs="$*"
 
 initstring="`cat init-$initfile.text`"
+xinitflagsf=$program-xinitflags.text
+if test -f $xinitflagsf
+then
+	useinitflags="$initflags $(cat $xinitflagsf)";
+else
+	useinitflags="$initflags /"
+fi
 
-echo "$initfile" >"$case.sys"
+echo $program $initfile $initflags >"$case.sys"
 echo "$queryargs" >>"$case.sys"
 
-echo running "hrecord /... $queryargs"
+EF_DISABLE_BANNER=1
+export EF_DISABLE_BANNER
+
+rm -f pipe.out pipe.err
+mknod pipe.out p
+mknod pipe.err p
+tee <pipe.out "$case.out" &
+tee_out=$!
+tee <pipe.err "$case.err" &
+tee_err=$!
+exec 4>pipe.out
+exec 5>pipe.err
+
+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" >&4 2>&5 \
+ $hrecord $useinitflags"$initstring" $queryargs
 rc=$?
 set -e
 
-egrep . -- "$case.stderr" "$case.stdout"
+echo "rc=$rc" >&4
+exec 4>&-
+exec 5>&-
+
+wait $tee_out
+wait $tee_err
+
 echo "exit status: $rc"
-exit $rc