X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=bd06d20d21cc7364ce1e056777e5fd03e35b4b29;hp=bc9e8c72fdc673f77b2d97a1c55ebfaf0d081c87;hb=9f4a5f045e36edddb3ffd23667a52f4ee319c675;hpb=17474e7732a9a3fcba657bec60264c2629724d5e

diff --git a/tests/lib b/tests/lib
index bc9e8c72..bd06d20d 100644
--- a/tests/lib
+++ b/tests/lib
@@ -480,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