diff options
| author | Andre Heinecke <[email protected]> | 2018-08-06 07:30:47 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2018-08-06 07:30:47 +0000 |
| commit | d09d19fa9fe1e81dd819b32208b4bd09f83e3918 (patch) | |
| tree | 26257f898ba309f150bde6aef2a7ef7de3433ca0 | |
| parent | cpp: Add safety checks for key update (diff) | |
| download | gpgme-d09d19fa9fe1e81dd819b32208b4bd09f83e3918.tar.gz gpgme-d09d19fa9fe1e81dd819b32208b4bd09f83e3918.zip | |
Make GNUPGHOME for tests overridable
* lang/python/tests/Makefile.am,
lang/qt/tests/Makefile.am,
tests/Makefile.am,
tests/gpg/Makefile.am,
tests/gpgsm/Makefile.am,
tests/opassuan/Makefile.am (GNUPGHOME): Make variable explict.
--
If the build directory has too long path, gpgme could fail.
This is similar to
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=847206
In order to fix that, this patch extracts the GNUPGHOME variable
to be presented directly in the Makefile and thus overridable by
command line option.
A build system can then create a symlink to the GNUPGHOME directory
in /tmp and use that symlink as the GNUPGHOME directory
thus making the path very short.
GnuPG-Bug-Id: T4091
Patch provided by vlmarek
Diffstat (limited to '')
| -rw-r--r-- | lang/python/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | lang/qt/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/gpg/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/gpgsm/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/opassuan/Makefile.am | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am index 3864f8ba..62970765 100644 --- a/lang/python/tests/Makefile.am +++ b/lang/python/tests/Makefile.am @@ -21,7 +21,8 @@ GPG_AGENT = gpg-agent test_srcdir = $(top_srcdir)/tests/gpg -TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \ +GNUPGHOME=$(abs_builddir) \ +TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) \ LC_ALL=C GPG_AGENT_INFO= \ top_srcdir=$(top_srcdir) \ srcdir=$(srcdir) \ diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am index 104672e4..bfe77ad5 100644 --- a/lang/qt/tests/Makefile.am +++ b/lang/qt/tests/Makefile.am @@ -21,7 +21,8 @@ GPG = gpg -TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) +GNUPGHOME=$(abs_builddir) +TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) EXTRA_DIST = initial.test diff --git a/tests/Makefile.am b/tests/Makefile.am index 30c35f09..b5825d20 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,7 +19,8 @@ ## Process this file with automake to produce Makefile.in -TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) +GNUPGHOME=$(abs_builddir) +TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) TESTS = t-version t-data t-engine-info diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index b50f4b07..392fc898 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -22,7 +22,8 @@ GPG = gpg GPG_AGENT = gpg-agent -TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \ +GNUPGHOME=$(abs_builddir) +TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \ top_srcdir=$(top_srcdir) # The keylist tests must come after the import and the edit test. diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am index d2acd05b..c2599204 100644 --- a/tests/gpgsm/Makefile.am +++ b/tests/gpgsm/Makefile.am @@ -22,7 +22,8 @@ GPGSM = gpgsm GPG_AGENT = gpg-agent -TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \ +GNUPGHOME=$(abs_builddir) +TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \ top_srcdir=$(top_srcdir) noinst_HEADERS = t-support.h diff --git a/tests/opassuan/Makefile.am b/tests/opassuan/Makefile.am index 31d26edd..1dba3e8f 100644 --- a/tests/opassuan/Makefile.am +++ b/tests/opassuan/Makefile.am @@ -17,7 +17,8 @@ ## Process this file with automake to produce Makefile.in -TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= +GNUPGHOME=$(abs_builddir) +TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) GPG_AGENT_INFO= noinst_HEADERS = TESTS = |