[git] GPGME - branch, master, updated. gpgme-1.11.1-109-gd09d19f

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  d09d19fa9fe1e81dd819b32208b4bd09f83e3918 (commit)
      from  a6e5c8bf18696007c48c6f362aa355020fe82f21 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d09d19fa9fe1e81dd819b32208b4bd09f83e3918
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Aug 6 09:30:47 2018 +0200

    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

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 3864f8b..6297076 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 104672e..bfe77ad 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 30c35f0..b5825d2 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 b50f4b0..392fc89 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 d2acd05..c259920 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 31d26ed..1dba3e8 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 =

-----------------------------------------------------------------------

Summary of changes:
 lang/python/tests/Makefile.am | 3 ++-
 lang/qt/tests/Makefile.am     | 3 ++-
 tests/Makefile.am             | 3 ++-
 tests/gpg/Makefile.am         | 3 ++-
 tests/gpgsm/Makefile.am       | 3 ++-
 tests/opassuan/Makefile.am    | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org