diff options
| author | Justus Winter <[email protected]> | 2016-07-15 09:59:57 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-07-15 09:59:57 +0000 |
| commit | 12a887050a560c4cacaf95e4cdb0cc42d8b87aa1 (patch) | |
| tree | b2605545e93019e8a41a661a4a515e6997582126 | |
| parent | doc: Update whats-new-in-2.1.txt (diff) | |
| download | gnupg-12a887050a560c4cacaf95e4cdb0cc42d8b87aa1.tar.gz gnupg-12a887050a560c4cacaf95e4cdb0cc42d8b87aa1.zip | |
tests: Check for gpgtar.
* tests/migrations/extended-pkf.scm: Skip test if gpgtar is not built.
* tests/migrations/from-classic.scm: Likewise.
* tests/openpgp/gpgtar.scm: Fix check for gpgtar.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
| -rwxr-xr-x | tests/migrations/extended-pkf.scm | 3 | ||||
| -rwxr-xr-x | tests/migrations/from-classic.scm | 3 | ||||
| -rwxr-xr-x | tests/openpgp/gpgtar.scm | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/tests/migrations/extended-pkf.scm b/tests/migrations/extended-pkf.scm index 3e76532ba..bf2c49e20 100755 --- a/tests/migrations/extended-pkf.scm +++ b/tests/migrations/extended-pkf.scm @@ -19,6 +19,9 @@ (load (with-path "common.scm")) +(catch (skip "gpgtar not built") + (call-check `(,GPGTAR --help))) + (define src-tarball (in-srcdir "extended-pkf.tar.asc")) (define (setup) diff --git a/tests/migrations/from-classic.scm b/tests/migrations/from-classic.scm index 2128532d8..d540470c3 100755 --- a/tests/migrations/from-classic.scm +++ b/tests/migrations/from-classic.scm @@ -19,6 +19,9 @@ (load (with-path "common.scm")) +(catch (skip "gpgtar not built") + (call-check `(,GPGTAR --help))) + (define src-tarball (in-srcdir "from-classic.tar.asc")) (define (setup) diff --git a/tests/openpgp/gpgtar.scm b/tests/openpgp/gpgtar.scm index 07f2fd7f7..15f528f28 100755 --- a/tests/openpgp/gpgtar.scm +++ b/tests/openpgp/gpgtar.scm @@ -19,8 +19,8 @@ (load (with-path "defs.scm")) -(unless (= 0 (call `(,(tool 'gpgtar) --help))) - (skip "gpgtar not installed")) +(catch (skip "gpgtar not built") + (call-check `(,(tool 'gpgtar) --help))) (define testfiles (append plain-files data-files)) (define gpgargs |