X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=bd06d20d21cc7364ce1e056777e5fd03e35b4b29;hb=6ff90ffc23a2d6a400d3c72d6caedf62da92b037;hp=8722522daeed3856a6497e1a92552f6646c62c6a;hpb=e26989680f3c7f3f219e799c3a64f1e4ee3808ee;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 8722522d..bd06d20d 100644
--- a/tests/lib
+++ b/tests/lib
@@ -422,6 +422,7 @@ t-dgit () {
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
  ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
+ ${DGIT_GITDEBREBASE_TEST+--git-debrebase=}${DGIT_GITDEBREBASE_TEST} \
 		${distro+${distro:+-d}}${distro--dtest-dummy} \
 		$DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
 		-kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $t_dgit_xopts "$@"
@@ -479,12 +480,12 @@ t-setup-done () {
 	local savedirs=$2
 	local importeval=$3
 
-	local import=IMPORT.${0##*/}
+	local import=IMPORT.${DGIT_TEST_TESTNAME-${0##*/}}
 	exec 4>$tmp/$import.new
 
 	local vn
 	for vn in $savevars; do
-		perl >&4 -I. -MDebian::Dgit -e '
+		perl >&4 -"I$root" -MDebian::Dgit -e '
 			printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
 		' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
 	done