chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in changelog entry for 1.6.1
[adns.git]
/
regress
/
m1test
diff --git
a/regress/m1test
b/regress/m1test
index 2ee0eeb6311f6f4466d5e2f53924d577718da797..37fab254f7c1dc2403e8b1d07fb70dc42afb5be0 100755
(executable)
--- a/
regress/m1test
+++ b/
regress/m1test
@@
-2,16
+2,12
@@
# usage: m1test <name> <initfile> [<initflags>] <queryargs>'
# test recording script
#
# 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-2000 Tony Finch <dot@dotat.at>
+# This file is part of adns, which is Copyright Ian Jackson
+# and contributors (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
#
# 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)
+# the Free Software Foundation; either version
3
, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# any later version.
#
# This program is distributed in the hope that it will be useful,
@@
-20,11
+16,11
@@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# 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.
+# along with this program; if not, write to the Free Software Foundation.
set -e
set -e
+: ${srcdir=.}
if [ $# -lt 3 ]
then
echo >&2 \
if [ $# -lt 3 ]
then
echo >&2 \
@@
-34,7
+30,7
@@
then
exit 1
fi
exit 1
fi
-case="case-$1"; shift
+case="
$srcdir/
case-$1"; shift
initfile="$1"; shift
hrecord="./adnstest_record"
initfile="$1"; shift
hrecord="./adnstest_record"
@@
-65,9
+61,9
@@
fi
queryargs="$*"
queryargs="$*"
-initstring="`cat init-$initfile.text`"
-xinitflagsf=$program-xinitflags.text
-if test -
f
$xinitflagsf
+initstring="`cat
$srcdir/
init-$initfile.text`"
+xinitflagsf=$
srcdir/$
program-xinitflags.text
+if test -
e
$xinitflagsf
then
useinitflags="$initflags $(cat $xinitflagsf)";
else
then
useinitflags="$initflags $(cat $xinitflagsf)";
else