tests: Rework check for trust models.
authorJustus Winter <justus@g10code.com>
Wed, 14 Dec 2016 10:45:52 +0000 (11:45 +0100)
committerJustus Winter <justus@g10code.com>
Wed, 14 Dec 2016 15:41:18 +0000 (16:41 +0100)
* 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>
tests/openpgp/defs.scm

index b198cdd..5249ca9 100644 (file)
                          (string-append prefix "/" (basename (caddr t))))))))
 
 
-(define have-opt-always-trust
+(define (gpg-has-option? option)
   (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
              ,@(if have-opt-always-trust '(--always-trust) '())))