diff options
| author | Werner Koch <[email protected]> | 2021-10-12 12:30:13 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-10-12 12:30:13 +0000 |
| commit | bcd5feec0e916b864d004a47f36a41e2eba3b10e (patch) | |
| tree | caa2c308d4bf0f9f3ca02968e93265bdd74ab089 /tests/openpgp/defs.scm | |
| parent | build: Let the release target also sign the wixlib. (diff) | |
| download | gnupg-bcd5feec0e916b864d004a47f36a41e2eba3b10e.tar.gz gnupg-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/openpgp/defs.scm')
| -rw-r--r-- | tests/openpgp/defs.scm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm index 61e3fdbda..6795512b7 100644 --- a/tests/openpgp/defs.scm +++ b/tests/openpgp/defs.scm @@ -112,18 +112,17 @@ (assert (equal? (percent-encode "foob%61r") "foob%2561r")) ;; Note that the entry for pinentry relies on the fact that -;; GNUPG_BUILD_ROOT has the bin,libexec,share directories (where we -;; have installed versions of the tools under test) as well as the -;; openpgp directory. The second element in each list is an envvar which -;; can be used to specifiy a different tool than the installed one. +;; GNUPG_BUILD_ROOT is the top of the build root. The second element +;; in each list is an envvar which can be used to specifiy a different +;; tool than the installed one. (define tools - '((gpgv "GPGV" "bin/gpgv") - (gpg-connect-agent "GPG_CONNECT_AGENT" "bin/gpg-connect-agent") - (gpgconf "GPGCONF" "bin/gpgconf") + '((gpgv "GPGV" "g10/gpgv") + (gpg-connect-agent "GPG_CONNECT_AGENT" "tools/gpg-connect-agent") + (gpgconf "GPGCONF" "tools/gpgconf") (gpg-preset-passphrase "GPG_PRESET_PASSPHRASE" - "libexec/gpg-preset-passphrase") - (gpgtar "GPGTAR" "bin/gpgtar") - (pinentry "PINENTRY" "openpgp/fake-pinentry"))) + "agent/gpg-preset-passphrase") + (gpgtar "GPGTAR" "tools/gpgtar") + (pinentry "PINENTRY" "tests/openpgp/fake-pinentry"))) (define (tool-hardcoded which) (let ((t (assoc which tools))) |