Reentrancy: Avoid reentrant callbacks

[adns.git] / regress / m1test

diff --git a/regress/m1test b/regress/m1test
index c556f8c669061ea78365664e1c5c543464779ba4..493db0b0fbea2a34ae6c98e181be3706a1f3fe62 100755 (executable)
--- a/regress/m1test
+++ b/regress/m1test
@@ -2,12 +2,11 @@
 # 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 file is part of adns, which is
+#    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1999-2000,2003,2006  Tony Finch
+#    Copyright (C) 1991 Massachusetts Institute of Technology
+#  (See the file INSTALL for full details.)
 #  
 #  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
@@ -25,15 +24,17 @@
 
 set -e
 
+: ${srcdir=.}
 if [ $# -lt 3 ]
 then
        echo >&2 \
-'usage: m1test <name> <initfile> [-<initflags>]
-              [=<hrecord-command-args>] <queryargs>'
+'usage: m1test <name> <initfile> [-<initflags>] ["<"]
+              [=<hrecord-command-args>] <queryargs>
+("<" means read input from case-<name>.in)'
        exit 1
 fi
 
-case="case-$1"; shift
+case="$srcdir/case-$1"; shift
 initfile="$1"; shift
 
 hrecord="./adnstest_record"
@@ -42,6 +43,11 @@ 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
@@ -59,8 +65,8 @@ fi
 
 queryargs="$*"
 
-initstring="`cat init-$initfile.text`"
-xinitflagsf=$program-xinitflags.text
+initstring="`cat $srcdir/init-$initfile.text`"
+xinitflagsf=$srcdir/$program-xinitflags.text
 if test -f $xinitflagsf
 then
        useinitflags="$initflags $(cat $xinitflagsf)";