[Pkg-gnupg-commit] [gnupg2] 56/124: tests: Fix using tools from the build directory.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

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>
---
 tests/openpgp/defs.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git