[git] GnuPG - branch, master, updated. gnupg-2.1.19-67-g06f1f16

[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  06f1f163e96f1039304fd3cf565cf9de1ca45849 (commit)
      from  ceb4b245752bb1fb43fde7e99f8d904ab8a9b5e2 (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 06f1f163e96f1039304fd3cf565cf9de1ca45849
Author: Justus Winter <justus at g10code.com>
Date:   Tue Mar 21 13:15:38 2017 +0100

    tests: Create temporary directories in '/tmp'.
    
    * tests/gpgscm/tests.scm (mkdtemp): Create temporary directories in
    '/tmp' on UNIX, or in '%Temp' on Windows.
    * tests/migrations/common.scm (run-test): Turn error into a warning.
    * tests/openpgp/defs.scm (start-agent): Likewise.
    --
    
    This fixes the problem of GnuPG components being unable to communicate
    because of too long GnuPG home directories in important build
    environments like the Debian build servers despite the use of socket
    directories.
    
    This reverts d75d20909d9f60d33ffd210def92278c0f383aad.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 0c02c34..329a31a 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -271,9 +271,11 @@
 ;; generic name is used.  Returns an absolute path.
 (define (mkdtemp . components)
   (canonical-path (_mkdtemp (if (null? components)
-				(string-append "gpgscm-" (get-isotime) "-"
-					       (basename-suffix *scriptname* ".scm")
-					       "-XXXXXX")
+				(path-join
+				 (if *win32* (getenv "Temp") "/tmp")
+				 (string-append "gpgscm-" (get-isotime) "-"
+						(basename-suffix *scriptname* ".scm")
+						"-XXXXXX"))
 				(apply path-join components)))))
 
 (define-macro (with-temporary-working-directory . expressions)
diff --git a/tests/migrations/common.scm b/tests/migrations/common.scm
index b1c90aa..fa8f129 100644
--- a/tests/migrations/common.scm
+++ b/tests/migrations/common.scm
@@ -53,7 +53,7 @@
    (untar-armored src-tarball)
    (setenv "GNUPGHOME" (getcwd) #t)
 
-   (catch (fail "Creating socket directory failed (see README):" (car *error*))
+   (catch (log "Warning: Creating socket directory failed:" (car *error*))
 	  (call-popen `(,gpgconf --create-socketdir) ""))
    (test (getcwd))
    (catch (log "Warning: Removing socket directory failed.")
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 64c086d..7c8e10a 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -446,7 +446,7 @@
     (atexit (lambda ()
 	      (with-home-directory gnupghome
 				   (stop-agent)))))
-  (catch (fail "Creating socket directory failed (see README):" (car *error*))
+  (catch (log "Warning: Creating socket directory failed:" (car *error*))
 	 (call-popen `(,(tool 'gpgconf) --create-socketdir) ""))
   (call-check `(,(tool 'gpg-connect-agent) --verbose
 		,(string-append "--agent-program=" (tool 'gpg-agent)

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

Summary of changes:
 tests/gpgscm/tests.scm      | 8 +++++---
 tests/migrations/common.scm | 2 +-
 tests/openpgp/defs.scm      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)


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