From bcd5feec0e916b864d004a47f36a41e2eba3b10e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 12 Oct 2021 14:30:13 +0200 Subject: tests: New way to make use of gpgconf.ctl in tests. * Makefile.am (all-local): New to setup symlinks. (distclean-local): New. * tests/Makefile.am: Remove the gpgconf related targets. Just keep gpgconf.ctl.in in EXTRA_DIST * tests/cms/Makefile.am (GNUPG_BUILD_ROOT): * tests/gpgme/Makefile.am (GPGSCM_PATH): * tests/openpgp/Makefile.am (GNUPG_BUILD_ROOT): * tests/pkits/Makefile.am (GNUPG_BUILD_ROOT): * tests/tpm2dtests/defs.scm (tools): Revert to the former values. * tests/openpgp/defs.scm (tools): Ditto. -- This Fixes-commit: 399ebf6d873d4178c1d527aa4df34bf16a76360e Fixes-commit: 84fcd8e6eb7e0786399e1f6461c3f60b0db2d070 because we ran into problems with the idea of first doing a test-install for the checks. "make distcheck" turned out to be too problematic. Symlinks are a better way of doing this. Also fixes GnuPG-bug-id: 5634 --- tests/cms/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/cms') diff --git a/tests/cms/Makefile.am b/tests/cms/Makefile.am index 2ad29351e..8e8c2e000 100644 --- a/tests/cms/Makefile.am +++ b/tests/cms/Makefile.am @@ -32,7 +32,7 @@ AM_CFLAGS = # if the shell used for inittests would uses an internal version of # pwd which handles symlinks differently. OLD_TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \ - GNUPG_BUILD_ROOT="$(abs_top_builddir)/tests" \ + GNUPG_BUILD_ROOT="$(abs_top_builddir)" \ GPGSM="$(GPGSM)" "$(srcdir)/runtest" TESTS_ENVIRONMENT = LC_ALL=C \ @@ -40,7 +40,7 @@ TESTS_ENVIRONMENT = LC_ALL=C \ PATH="../gpgscm:$(PATH)" \ abs_top_srcdir="$(abs_top_srcdir)" \ objdir="$(abs_top_builddir)" \ - GNUPG_BUILD_ROOT="$(abs_top_builddir)/tests" \ + GNUPG_BUILD_ROOT="$(abs_top_builddir)" \ GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm" XTESTS = \ -- cgit v1.2.3