test suite: gdr-viagit, gdr-newupstream: do not auto-import t-setup-gnupg.

We provide a new mechanism for individual tests to disable the
automatic t-setup-import of gnupg.

We need to add this to all the other setup/ that these import, too.
gdr-convert-gbp is particularly awkward because it wants gnupg if
$ifarchive isn't `:'.  There we arrange to suppress its automatic
inclusion, but add it again by hand if appropriate.

This fixes these two tests in chroots without gnupg.

Closes:#902559.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 8 insertions, 4 deletions

diff --git a/tests/lib b/tests/lib
index bd06d20..f3fb0da 100644
--- a/tests/lib
+++ b/tests/lib
@@ -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