diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tests/gpgscm/ffi.c | 8 | ||||
| -rw-r--r-- | tests/openpgp/all-tests.scm | 40 |
3 files changed, 38 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 18e6c09bb..20a6ed64e 100644 --- a/configure.ac +++ b/configure.ac @@ -1541,6 +1541,11 @@ if test "$development_version" = yes; then [Defined if this is not a regular release]) fi +if test "$USE_MAINTAINER_MODE" = "yes"; then + AC_DEFINE(MAINTAINER_MODE,1, + [Defined if this build is in maintainer mode]) +fi + AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) GNUPG_CHECK_GNUMAKE diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c index 4c03ba674..4c2148a26 100644 --- a/tests/gpgscm/ffi.c +++ b/tests/gpgscm/ffi.c @@ -1442,6 +1442,14 @@ ffi_init (scheme *sc, const char *argv0, const char *scriptname, #endif ); + ffi_define (sc, "*maintainer-mode*", +#if MAINTAINER_MODE + sc->T +#else + sc->F +#endif + ); + ffi_define (sc, "*stdin*", sc->vptr->mk_port_from_file (sc, stdin, port_input)); diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm index 4dd6d6fe1..e65d52730 100644 --- a/tests/openpgp/all-tests.scm +++ b/tests/openpgp/all-tests.scm @@ -51,18 +51,28 @@ (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am") (lambda (filename port key) (parse-makefile port key)) "XTESTS")) - (append - (map (lambda (name) - (test::scm setup - (path-join "tests" "openpgp" name) - (in-srcdir "tests" "openpgp" name))) all-tests) - (map (lambda (name) - (test::scm setup-use-keyring - (qualify (path-join "tests" "openpgp" name) "use-keyring") - (in-srcdir "tests" "openpgp" name) - "--use-keyring")) all-tests) - (map (lambda (name) - (test::scm setup-extended-key-format - (qualify (path-join "tests" "openpgp" name) "extended-key-format") - (in-srcdir "tests" "openpgp" name) - "--extended-key-format")) all-tests))) + + (define tests + (map (lambda (name) + (test::scm setup + (path-join "tests" "openpgp" name) + (in-srcdir "tests" "openpgp" name))) all-tests)) + + (when *maintainer-mode* + (set! tests + (append + tests + (map (lambda (name) + (test::scm setup-use-keyring + (qualify (path-join "tests" "openpgp" name) + "use-keyring") + (in-srcdir "tests" "openpgp" name) + "--use-keyring")) all-tests) + (map (lambda (name) + (test::scm setup-extended-key-format + (qualify (path-join "tests" "openpgp" name) + "extended-key-format") + (in-srcdir "tests" "openpgp" name) + "--extended-key-format")) all-tests)))) + + tests) |