From 06f1f163e96f1039304fd3cf565cf9de1ca45849 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 21 Mar 2017 13:15:38 +0100 Subject: [PATCH] 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 --- tests/gpgscm/tests.scm | 8 +++++--- tests/migrations/common.scm | 2 +- tests/openpgp/defs.scm | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm index 0c02c349a..329a31a58 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 b1c90aa04..fa8f1295a 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 64c086d8c..7c8e10a7e 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)