X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=f3fb0dab462cbac4ca0dcdb9c575ee3783a533aa;hp=dc88643243e9f97465c012164889e6aefd9d6d0e;hb=3ae4d20d8146c3ea111b3f622bf00adbd4e6442f;hpb=e5dcd8e57251ade4f309357bd6cfe2501bdc1afb

diff --git a/tests/lib b/tests/lib
index dc886432..f3fb0dab 100644
--- a/tests/lib
+++ b/tests/lib
@@ -485,7 +485,7 @@ t-setup-done () {
 
 	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
@@ -1134,7 +1134,11 @@ t-alt-test () {
 
 t-git-config dgit.default.old-dsc-distro test-dummy
 
-case "$0" in
-*/gnupg) ;;
-*)	t-setup-import gnupg	;;
-esac
+for import in ${autoimport-gnupg}; do
+	case "$0" in
+	*/$import) ;;
+	*)
+		t-setup-import $import
+		;;
+	esac
+done