tests: Create temporary directories in '/tmp'.
authorJustus Winter <justus@g10code.com>
Tue, 21 Mar 2017 12:15:38 +0000 (13:15 +0100)
committerJustus Winter <justus@g10code.com>
Tue, 21 Mar 2017 12:15:38 +0000 (13:15 +0100)
* 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@g10code.com>
tests/gpgscm/tests.scm
tests/migrations/common.scm
tests/openpgp/defs.scm

index 0c02c34..329a31a 100644 (file)
 ;; 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)
index b1c90aa..fa8f129 100644 (file)
@@ -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.")
index 64c086d..7c8e10a 100644 (file)
     (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)