X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fr1test;h=533fdabd2d62fd97691d30c4bf9ed5b11bac0fc2;hp=a325600830ed437fdb8ac1b6a6ffcc71b93080a1;hb=898afc783a7bd5947405b4fd828a34dfbd9b99a8;hpb=67a57aae0e981c235a2cb8d27214a3d4213ff941

diff --git a/regress/r1test b/regress/r1test
index a325600..533fdab 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,12 +2,11 @@
 # usage: r1test <testcasename>
 # test execution script, for running one test
 #
-#  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
@@ -24,22 +23,23 @@
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
 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)";
+	initflags="$initflags `cat $xinitflagsf`";
 else
 	initflags="$initflags /"
 fi
@@ -56,10 +56,18 @@ else
 	exec </dev/null
 fi
 
+playback=./${program}_playback
+if test ! -f $playback
+then
+	printf "SKIPPED-$casename "
+	mrc=5
+	exit
+fi
+
 set +e
-ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
-ADNS_TEST_IN_FD=4 \
- ./${program}_playback $initflags"$initstring" $queryargs
+ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \
+ 3>>"$ocase.report" 4<&4 >"$ocase.out" 2>"$ocase.err" \
+ $debug $playback $initflags"$initstring" $queryargs
 rc=$?
 set -e
 
@@ -83,7 +91,7 @@ do
 	fi
 done
 
-cat >"$ocase.leftover"
+cat <&4 >"$ocase.leftover"
 if egrep . /dev/null "$ocase.leftover"
 then
 	failwhy="$failwhy EXITED EARLY"