diff options
author | Werner Koch <wk@gnupg.org> | 2021-10-12 14:30:13 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2021-10-12 14:30:13 +0200 |
commit | bcd5feec0e916b864d004a47f36a41e2eba3b10e (patch) | |
tree | caa2c308d4bf0f9f3ca02968e93265bdd74ab089 /tests/Makefile.am | |
parent | build: Let the release target also sign the wixlib. (diff) | |
download | gnupg2-bcd5feec0e916b864d004a47f36a41e2eba3b10e.tar.xz gnupg2-bcd5feec0e916b864d004a47f36a41e2eba3b10e.zip |
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
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d26ef9df1..9038ccd0b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,31 +44,3 @@ noinst_PROGRAMS = asschk endif asschk_SOURCES = asschk.c - -TESTINST_DIRS = bin sbin libexec share etc - -clean-local: clean-local-testinst - -# We do a cd ../tests here so that we make sure tha the bin dir etc -# are under our tests dir. This is failsafe thingy in case this -# Makefile rule is accidently run /. -clean-local-testinst: - -(cd ../tests && rm -rf $(TESTINST_DIRS)) - -# Before we can run any tests we need to make sure that we have a -# proper test installation with this dir (tests) as root dir. It is -# too hard to track the built files here thus we do the install step -# always. -check-recursive: bin/gpgconf.ctl - -bin/gpgconf.ctl: FORCE - @echo '==== Installing into a test root ======' - @-mkdir bin 2>/dev/null - @cat $(srcdir)/gpgconf.ctl.in > bin/gpgconf.ctl.tmp - cd .. && \ - $(MAKE) $(AM_MAKEFLAGS) install prefix=$(abs_top_builddir)/tests - @mv bin/gpgconf.ctl.tmp bin/gpgconf.ctl - @echo '==== Finished installing into a test root ======' - - -.PHONY: FORCE clean-local-testinst |