summaryrefslogtreecommitdiff
path: root/tests/setup/gdr-convert-gbp-noarchive
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-27 21:41:38 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-27 23:01:06 +0100
commit3fbce7431379321c745f304c0f0134ae9b066701 (patch)
tree82c1bdf12490003232e7325d6cfc059dd8096aac /tests/setup/gdr-convert-gbp-noarchive
parent99b7b3246b32cde43dca421571c06f42e00c1baf (diff)
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>
Diffstat (limited to 'tests/setup/gdr-convert-gbp-noarchive')
-rwxr-xr-xtests/setup/gdr-convert-gbp-noarchive1
1 files changed, 1 insertions, 0 deletions
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