X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=4ddd6d8ac7451d34a5728b759bac0c5a52ef0f64;hb=210a3e19c0f0e76b71d46c2bd070b90d504231c1;hp=993ec36b647a44953d1a67d59cb536b7ca5a8969;hpb=f897c3996411b844e971d66171c1e1aa290a6f24;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 993ec36b..4ddd6d8a 100644
--- a/tests/lib
+++ b/tests/lib
@@ -28,6 +28,8 @@ t-set-intree
 : ${DGIT_TEST_DEBUG=-D}
 export DGIT_TEST_DEBUG
 
+: ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
+
 export GIT_COMMITTER_DATE='1440253867 +0100'
 export GIT_AUTHOR_DATE='1440253867 +0100'
 
@@ -392,6 +394,7 @@ t-fscks () {
 }
 
 t-ok () {
+	: '========================================'
 	t-fscks
 	echo ok.
 }
@@ -406,7 +409,9 @@ t-dgit () {
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
+ ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
+		${distro--dtest-dummy} ${distro+${distro:+-d}${distro}} \
+		$DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
 		-k39B13D8A $t_dgit_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
@@ -775,6 +780,11 @@ t-822-field () {
 	' <$file
 }
 
+t-defdistro () {
+	export DGIT_TEST_DISTRO=''
+	t-git-config dgit-suite.unstable.distro test-dummy
+}
+
 t-stunt-envvar () {
 	local var=$1
 	local tstunt=$2
@@ -798,7 +808,14 @@ t-tstunt--save-real () {
 	local rc
 	local real
 	set +e
-	real=$(type -p "$f")
+	real=$(
+		p=":$PATH:"
+		p="${p/:"$tmp/tstunt":/:}"
+		p="${p%:}"
+		p="${p#:}"
+		PATH="$p"
+		type -p "$f"
+	)
 	rc=$?
 	set -e
 
@@ -851,7 +868,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"
 }