[git] GnuPG - branch, master, updated. gnupg-2.1.19-56-ga98459d

[by Justus Winter]

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  a98459d3f4ec3d196fb0adb0e90dadf40abc8c81 (commit)
      from  c7833eca38fdb8d9ba7b59438ea87d651b8bf7ba (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 a98459d3f4ec3d196fb0adb0e90dadf40abc8c81
Author: Justus Winter <justus at g10code.com>
Date:   Wed Mar 15 14:36:27 2017 +0100

    tests: Fix using tools from the build directory.
    
    * tests/openpgp/defs.scm (gpg-conf'): Explicitly pass the build prefix
    to gpgconf here...
    (gpg-components): ... instead of only here.
    --
    
    Previously, gpgconf was not invoked with '--build-prefix' when
    changing the configuration.  This made tests using this facility fail
    (e.g. the TOFU test).  This only affected release builds, because in
    development builds gpgconf picks up the build prefix from the
    environment.
    
    GnuPG-bug-id: 2979
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 568ffab..7c8e10a 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -140,10 +140,16 @@
 (define valgrind
   '("/usr/bin/valgrind" --leak-check=full --error-exitcode=154))
 
+(unless installed?
+	(setenv "GNUPG_BUILDDIR" (getenv "objdir") #t))
+
 (define (gpg-conf . args)
   (gpg-conf' "" args))
 (define (gpg-conf' input args)
-  (let ((s (call-popen `(,(tool-hardcoded 'gpgconf) , at args) input)))
+  (let ((s (call-popen `(,(tool-hardcoded 'gpgconf)
+			 ,@(if installed? '()
+			       (list '--build-prefix (getenv "objdir")))
+			 , at args) input)))
     (map (lambda (line) (map percent-decode (string-split line #\:)))
 	 (string-split-newlines s))))
 (define :gc:c:name car)
@@ -180,13 +186,7 @@
      (gpg-conf' (string-append key ":16:")
 		`(--change-options ,component)))))
 
-
-(unless installed?
-	(setenv "GNUPG_BUILDDIR" (getenv "objdir") #t))
-(define gpg-components (apply gpg-conf
-			`(,@(if installed? '()
-				(list '--build-prefix (getenv "objdir")))
-			  --list-components)))
+(define gpg-components (apply gpg-conf '(--list-components)))
 
 (define (tool which)
   (case which

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

Summary of changes:
 tests/openpgp/defs.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org