tests: Handle the case with DISABLE_REGEX.
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 13 Nov 2017 09:50:30 +0000 (18:50 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 13 Nov 2017 09:50:30 +0000 (18:50 +0900)
* 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>
tests/openpgp/Makefile.am
tests/openpgp/all-tests.scm

index 827d3e3..e5be42b 100644 (file)
@@ -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
 
index d687fe4..e12b175 100644 (file)
@@ -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"))