aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2017-03-21 12:15:38 +0000
committerJustus Winter <[email protected]>2017-03-21 12:15:38 +0000
commitcfc49428a427d1a140424c687cb45ba00117d443 (patch)
tree4a45ebb16bc3d323bac1812aee1f770f6a79503d
parentgpgscm: Simplify hash tables. (diff)
downloadlibgpg-error-cfc49428a427d1a140424c687cb45ba00117d443.tar.gz
libgpg-error-cfc49428a427d1a140424c687cb45ba00117d443.zip
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 <[email protected]>
-rw-r--r--tests.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests.scm b/tests.scm
index 0c02c34..329a31a 100644
--- a/tests.scm
+++ b/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)