X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fr1test;h=d1607824bf702c503347c203d7741c804fd86fa5;hp=1d5aca8e5854491154ba9ff2e125820020badcf6;hb=58a876e5ac9539ff14acb7dc3ea3633f5bdb41d8;hpb=ae8cc9775a6eb23901a89a2604f73525b0553db8

diff --git a/regress/r1test b/regress/r1test
index 1d5aca8..d160782 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -3,14 +3,15 @@
 # test execution script, for running one test
 #
 #  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1997-2000,2003,2006,2014  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,23 +20,23 @@
 #  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
+: ${srcdir=.}
 mrc=1
 trap 'exit $mrc' 0
 
 casename="$1"
-case="case-$casename"
+case="$srcdir/case-$casename"
 ocase="output-$casename"
 
 exec 4<"$case.sys"
 read <&4 program initfile initflags
 read <&4 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
 	initflags="$initflags `cat $xinitflagsf`";
@@ -66,7 +67,7 @@ fi
 set +e
 ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \
  3>>"$ocase.report" 4<&4 >"$ocase.out" 2>"$ocase.err" \
- $playback $initflags"$initstring" $queryargs
+ $ADNS_TEST_DEBUG $playback $initflags"$initstring" $queryargs
 rc=$?
 set -e