From 3fbce7431379321c745f304c0f0134ae9b066701 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 27 Jun 2018 21:41:38 +0100 Subject: 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 --- tests/setup/gdr-convert-gbp | 3 +++ tests/setup/gdr-convert-gbp-noarchive | 1 + 2 files changed, 4 insertions(+) (limited to 'tests/setup') diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index 0b525c8..e523fd3 100755 --- a/tests/setup/gdr-convert-gbp +++ b/tests/setup/gdr-convert-gbp @@ -1,8 +1,11 @@ #!/bin/bash set -e +autoimport= . tests/lib . $troot/lib-gdr +$ifarchive t-setup-import gnupg + t-dependencies GDR t-tstunt-parsechangelog diff --git a/tests/setup/gdr-convert-gbp-noarchive b/tests/setup/gdr-convert-gbp-noarchive index dfeea3b..1d6758b 100755 --- a/tests/setup/gdr-convert-gbp-noarchive +++ b/tests/setup/gdr-convert-gbp-noarchive @@ -1,4 +1,5 @@ #!/bin/bash +autoimport= set -e . tests/lib . $troot/lib-gdr -- cgit v1.2.3