security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

tests: Rework check for trust models.

Browse Source 
* tests/openpgp/defs.scm (gpg-has-option?): New function.
(have-opt-always-trust): Use a simpler test for that option.  This way
that is less distracting when we run the tests with verbose=3.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-12-14 11:45:52 +01:00
parent d6e332422f
commit 55dc81125a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/openpgp/defs.scm
View File

@ -76,9 +76,14 @@
(string-append prefix "/" (basename (caddr t)))))))) (string-append prefix "/" (basename (caddr t))))))))
(define have-opt-always-trust (define (gpg-has-option? option)
(string-contains? (call-popen `(,(tool 'gpg) --dump-options) "") (string-contains? (call-popen `(,(tool 'gpg) --dump-options) "")
"--always-trust")) option))
(define have-opt-always-trust
(catch #f
(call-check `(,(tool 'gpg) --gpgconf-test --always-trust))
#t))
(define GPG `(,(tool 'gpg) --no-permission-warning (define GPG `(,(tool 'gpg) --no-permission-warning
,@(if have-opt-always-trust '(--always-trust) '()))) ,@(if have-opt-always-trust '(--always-trust) '())))