diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2017-11-13 10:50:30 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2017-11-13 10:50:30 +0100 |
| commit | 80b904543486a2f12087bc34a6049ede4eb75940 (patch) | |
| tree | 6f837a3fd8628fb9a50d72c096852c1a20a2d7a9 /tests | |
| parent | tests: Run the trust-pgp-4 test again. (diff) | |
| download | gnupg2-80b904543486a2f12087bc34a6049ede4eb75940.tar.xz gnupg2-80b904543486a2f12087bc34a6049ede4eb75940.zip | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/openpgp/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/openpgp/all-tests.scm | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index 827d3e32f..e5be42b41 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -85,7 +85,6 @@ XTESTS = \ trust-pgp-1.scm \ trust-pgp-2.scm \ trust-pgp-3.scm \ - trust-pgp-4.scm \ gpgtar.scm \ use-exact-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 \ 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: -rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm index d687fe49b..e12b175b9 100644 --- a/tests/openpgp/all-tests.scm +++ b/tests/openpgp/all-tests.scm @@ -48,7 +48,7 @@ (define setup-extended-key-format (setup* "extended-key-format")) (define all-tests - (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am") + (parse-makefile-expand "Makefile" (lambda (filename port key) (parse-makefile port key)) "XTESTS")) |