From 12a887050a560c4cacaf95e4cdb0cc42d8b87aa1 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 15 Jul 2016 11:59:57 +0200 Subject: 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 --- tests/migrations/extended-pkf.scm | 3 +++ tests/migrations/from-classic.scm | 3 +++ 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 -- cgit v1.2.3