X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=1af0288aeace7db78adc3b6518af4529dc1972af;hb=4c85f5a65adbe2a96f0690788a25146950b31397;hp=62e47ddac839fac8a177c7de22a54c38dd6746a8;hpb=a724362d178cf58fbe5d6671493bde1c2784a4ed;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 62e47dda..1af0288a 100644
--- a/tests/lib
+++ b/tests/lib
@@ -392,6 +392,7 @@ t-fscks () {
 }
 
 t-ok () {
+	: '========================================'
 	t-fscks
 	echo ok.
 }
@@ -406,7 +407,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 "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
@@ -798,7 +801,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