diff options
Diffstat (limited to 'tests/openpgp')
| -rw-r--r-- | tests/openpgp/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/openpgp/README | 9 | ||||
| -rw-r--r-- | tests/openpgp/defs.scm | 19 |
3 files changed, 14 insertions, 16 deletions
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index cecbde8cb..3d0cc9db9 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -38,7 +38,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 = \ diff --git a/tests/openpgp/README b/tests/openpgp/README index b7ec6f784..63f1886c5 100644 --- a/tests/openpgp/README +++ b/tests/openpgp/README @@ -1,4 +1,5 @@ # Emacs, this is an -*- org -*- file. +#+STARTUP: showall * How to run the test suite ** tldr: How to run all tests fast. @@ -95,11 +96,9 @@ data files. Used to locate the Scheme library as well as code used by the test suite. **** GNUPG_BUILD_ROOT -To locate the actual binaries under test the test suite requires that -those binaries and associate files are installed to a test location. -This envvar gives the root directory of the install tree. See -tests/gpgconf.ctl for the way we tell the GnuPG components this -location. Note that we can't use that envvar directlyr because this +This envvar gives the root directory of the build tree. See +tests/gpgconf.ctl.in for the way we tell the GnuPG components this +location. Note that we can't use that envvar directly because this would allow user scripts and other software to accidently mess up the used components. **** argv[0] 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))) |