diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 28 | ||||
| -rw-r--r-- | tests/cms/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/gpgme/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/openpgp/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/openpgp/README | 9 | ||||
| -rw-r--r-- | tests/openpgp/defs.scm | 19 | ||||
| -rw-r--r-- | tests/pkits/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/tpm2dtests/defs.scm | 14 |
8 files changed, 25 insertions, 55 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 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 = \ diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am index aa41940ca..fc1cfc328 100644 --- a/tests/gpgme/Makefile.am +++ b/tests/gpgme/Makefile.am @@ -33,7 +33,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 # XXX: Currently, one cannot override automake's 'check' target. As a 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))) diff --git a/tests/pkits/Makefile.am b/tests/pkits/Makefile.am index b85e110b5..65db8bb1e 100644 --- a/tests/pkits/Makefile.am +++ b/tests/pkits/Makefile.am @@ -21,7 +21,7 @@ GPGSM = ../../sm/gpgsm 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) silent=yes diff --git a/tests/tpm2dtests/defs.scm b/tests/tpm2dtests/defs.scm index eb840206f..0fef71806 100644 --- a/tests/tpm2dtests/defs.scm +++ b/tests/tpm2dtests/defs.scm @@ -61,14 +61,14 @@ (assert (equal? (percent-encode "foob%61r") "foob%2561r")) (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") - (tpm2daemon "TPM2DAEMON" "libexec/tpm2daemon") - (pinentry "PINENTRY" "openpgp/fake-pinentry"))) + "agent/gpg-preset-passphrase") + (gpgtar "GPGTAR" "tools/gpgtar") + (tpm2daemon "TPM2DAEMON" "tpm2d/tpm2daemon") + (pinentry "PINENTRY" "tests/openpgp/fake-pinentry"))) (define with-valgrind? (not (string=? (getenv "with_valgrind") ""))) |