aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2017-04-06 10:33:37 +0000
committerJustus Winter <[email protected]>2017-04-06 10:36:00 +0000
commit94645311f8a3e9ae33643512f87fbef41bf0556f (patch)
treea809f9d4e39a868d06d3476b5d008579239367c5
parenttests: Fix setup of ephemeral home directories. (diff)
downloadgnupg-94645311f8a3e9ae33643512f87fbef41bf0556f.tar.gz
gnupg-94645311f8a3e9ae33643512f87fbef41bf0556f.zip
tests: Make test more robust.
* tests/openpgp/4gb-packet.scm: Skip if we do not have BZIP2. * tests/openpgp/defs.scm (have-compression-algo?): New function. GnuPG-bug-id: 3028 Signed-off-by: Justus Winter <[email protected]>
-rwxr-xr-xtests/openpgp/4gb-packet.scm7
-rw-r--r--tests/openpgp/defs.scm2
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/openpgp/4gb-packet.scm b/tests/openpgp/4gb-packet.scm
index b827181a6..109e61dc9 100755
--- a/tests/openpgp/4gb-packet.scm
+++ b/tests/openpgp/4gb-packet.scm
@@ -23,6 +23,7 @@
(load (with-path "defs.scm"))
(setup-environment)
-(if (= 0 (call `(,@GPG --list-packets ,(in-srcdir "4gb-packet.asc"))))
- (info "Can parse 4GB packets.")
- (fail "Failed to parse 4GB packet."))
+(unless (have-compression-algo? "BZIP2")
+ (skip "BZIP2 support not compiled in."))
+
+(call-check `(,@GPG --list-packets ,(in-srcdir "4gb-packet.asc")))
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 815a560c7..29eb7753d 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -258,6 +258,8 @@
(not (not (member x (force all-hash-algos)))))
(define (have-cipher-algo? x)
(not (not (member x (force all-cipher-algos)))))
+(define (have-compression-algo? x)
+ (not (not (member x (force all-compression-algos)))))
(define (gpg-pipe args0 args1 errfd)
(lambda (source sink)