diff options
Diffstat (limited to 'tests/setup')
-rwxr-xr-x | tests/setup/gdr-convert-gbp | 3 | ||||
-rwxr-xr-x | tests/setup/gdr-convert-gbp-noarchive | 1 | ||||
-rwxr-xr-x | tests/setup/gnupg | 6 |
3 files changed, 8 insertions, 2 deletions
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 diff --git a/tests/setup/gnupg b/tests/setup/gnupg index c88d40b..7a164ef 100755 --- a/tests/setup/gnupg +++ b/tests/setup/gnupg @@ -7,10 +7,11 @@ cp $troot/gnupg/* $tmp/gnupg chmod go-rw $tmp/gnupg/* export DGIT_TEST_GNUPG_GLOBAL_LOCK=$tmp/gnupg/dgit-test-global-lock +export DGIT_TEST_GNUPG_LOG=$tmp/gnupg-workarounds.log setup=' export GNUPGHOME=$tmp/gnupg - export DGIT_TEST_GNUPG_GLOBAL_LOCK + export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG cat >$tmp/gnupg/gpg-agent.conf <<END log-file $tmp/gnupg/AGENT.log @@ -27,6 +28,7 @@ eval "$setup" gpg --list-secret -t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK' 'gnupg' "$setup" +t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \ + 'gnupg' "$setup" t-ok |