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

diff --git a/tests/lib b/tests/lib
index dc886432..4ef275ca 100644
--- a/tests/lib
+++ b/tests/lib
@@ -41,6 +41,7 @@ export DGIT_TEST_TROOT=$troot
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
+	export DGIT_TEST_BYHAND=1
 	mkdir -p tests/tmp
 	tmpbase=$troot/tmp
 	tmp=tests/tmp/$testname
@@ -152,7 +153,7 @@ t-reporefs () {
 	 exec >"$outputfile"
 	 if test -d $whichrepo; then
 		cd $whichrepo
-		git show-ref |sort
+		git show-ref |t-sort
 	fi)
 }
 
@@ -485,7 +486,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 +1135,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