X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib;h=a4932d335cd36109a440c46ad9156a812d436616;hb=dda17d8a6fec27f631653cf8ac63ba6d96e642c3;hp=50d614ee16e1346f302b2a58ef64a067b3d6dbc9;hpb=a5ab9e488522b8fb74a6eadc4a7acf9199e782c4;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 50d614ee..a4932d33 100644
--- a/tests/lib
+++ b/tests/lib
@@ -406,7 +406,8 @@ t-dgit () {
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
+		${distro--dtest-dummy} ${distro+${distro:+-d}${distro}} \
+		$DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
 		-k39B13D8A $t_dgit_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
@@ -789,12 +790,41 @@ t-stunt-envvar () {
 	'
 }
 
+t-tstunt--save-real () {
+	local f="$1"
+	case "$f" in
+	*/*) return ;;
+	esac
+
+	local rc
+	local real
+	set +e
+	real=$(type -p "$f")
+	rc=$?
+	set -e
+
+	case $rc in
+	1)	return ;;
+	0)	;;
+	*)	fail "did not find $f on PATH $PATH" ;;
+	esac
+
+	local varname=${f//[^_0-9a-zA-Z]/_}
+	varname=DGIT_TEST_REAL_${varname^^}
+
+	eval "
+		: \${$varname:=\$real}
+		export $varname
+	"
+}
+
 t-tstunt () {
 	local tstunt=$tmp/tstunt
 	t-stunt-envvar PATH $tstunt
 	t-stunt-envvar PERLLIB $tstunt
 	local f
 	for f in "$@"; do
+		t-tstunt--save-real $f
 		f="./$f"
 		local d="$tstunt/${f%/*}"
 		mkdir -p $d
@@ -811,8 +841,6 @@ t-tstunt-lintian () {
 }
 
 t-tstunt-debuild () {
-	: ${DGIT_TEST_REAL_DEBUILD:=$(type -p debuild)}
-	export DGIT_TEST_REAL_DEBUILD
 	t-tstunt debuild
 }
 
@@ -824,7 +852,11 @@ t-incoming-dsc () {
 t-ref-dsc-dgit () {
 	t-incoming-dsc
 	local val; val=`t-822-field $incoming_dsc Dgit`
-	perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
+	val=$( perl -e '
+		$_=shift @ARGV;
+		die "Dgit $_ ?" unless m/^\w+\b/;
+		print $&,"\n" or die $!;
+	' "$val")
 	t-ref-same-val $incoming_dsc "$val"
 }