X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fm1test;h=5f928f12a9d2a4bb8a94212c84924b6579f6f4b7;hb=fc440c64836370db9d8cb1a25f09c9df0786f865;hp=493db0b0fbea2a34ae6c98e181be3706a1f3fe62;hpb=2dee2b7a71c858a78d06814eb98f23ede5602e37;p=adns.git diff --git a/regress/m1test b/regress/m1test index 493db0b..5f928f1 100755 --- a/regress/m1test +++ b/regress/m1test @@ -3,14 +3,15 @@ # test recording script # # This file is part of adns, which is -# Copyright (C) 1997-2000,2003,2006 Ian Jackson +# Copyright (C) 1997-2000,2003,2006,2014-2016,2020 Ian Jackson +# Copyright (C) 2014 Mark Wooding # 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 -# 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, @@ -19,8 +20,7 @@ # 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 @@ -67,7 +67,7 @@ queryargs="$*" initstring="`cat $srcdir/init-$initfile.text`" xinitflagsf=$srcdir/$program-xinitflags.text -if test -f $xinitflagsf +if test -e $xinitflagsf then useinitflags="$initflags $(cat $xinitflagsf)"; else