summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2022-04-26 03:53:30 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2022-04-26 03:53:30 +0200
commit16720e1f54db31f3f890756ec6b2280630569fa0 (patch)
treeba0a8b270fe8a6be0453adeeab2c411d91c1855c /tests
parentPost release updates (diff)
downloadgnupg2-16720e1f54db31f3f890756ec6b2280630569fa0.tar.xz
gnupg2-16720e1f54db31f3f890756ec6b2280630569fa0.zip
tests: Fix check-all for tests/openpgp.
* tests/openpgp/Makefile.am: Revert the change by DISABLE_REGEXP. * tests/openpgp/all-tests.scm: Likewise. -- Fixes-commit: ba247a114c75a84473c11c1484013b09fbb9bcd1 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/openpgp/Makefile.am3
-rw-r--r--tests/openpgp/all-tests.scm2
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index be3e350fc..5c99a045c 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -86,6 +86,7 @@ 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,8 +278,6 @@ 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
-XTESTS += trust-pgp-4.scm
-
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 046012cfa..3b266d595 100644
--- a/tests/openpgp/all-tests.scm
+++ b/tests/openpgp/all-tests.scm
@@ -48,7 +48,7 @@
(define setup-use-keyboxd (setup* "use-keyboxd"))
(define all-tests
- (parse-makefile-expand "Makefile"
+ (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am")
(lambda (filename port key) (parse-makefile port key))
"XTESTS"))