1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

tests: Handle the case with DISABLE_REGEX.

* tests/openpgp/Makefile.am [DISABLE_REGEX] (EXTRA_DIST, XTESTS):
  Conditionalize.
* tests/openpgp/all-tests.scm (all-tests): Input file is Makefile.

--

The feature is only valid with !DISABLE_REGEX.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-11-13 18:50:30 +09:00
parent a1fe3708d0
commit 80b9045434
2 changed files with 7 additions and 2 deletions

View File

@ -85,7 +85,6 @@ XTESTS = \
trust-pgp-1.scm \ trust-pgp-1.scm \
trust-pgp-2.scm \ trust-pgp-2.scm \
trust-pgp-3.scm \ trust-pgp-3.scm \
trust-pgp-4.scm \
gpgtar.scm \ gpgtar.scm \
use-exact-key.scm \ use-exact-key.scm \
default-key.scm \ default-key.scm \
@ -277,6 +276,12 @@ CLEANFILES = prepared.stamp x y yy z out err $(data_files) \
gnupg-test.stop random_seed gpg-agent.log tofu.db \ gnupg-test.stop random_seed gpg-agent.log tofu.db \
passphrases sshcontrol S.gpg-agent.ssh report.xml passphrases sshcontrol S.gpg-agent.ssh report.xml
if DISABLE_REGEX
EXTRA_DIST += trust-pgp-4.scm
else
XTESTS += trust-pgp-4.scm
endif
clean-local: clean-local:
-rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d -rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d

View File

@ -48,7 +48,7 @@
(define setup-extended-key-format (setup* "extended-key-format")) (define setup-extended-key-format (setup* "extended-key-format"))
(define all-tests (define all-tests
(parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am") (parse-makefile-expand "Makefile"
(lambda (filename port key) (parse-makefile port key)) (lambda (filename port key) (parse-makefile port key))
"XTESTS")) "XTESTS"))