aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpgscm
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
commit06f1f163e96f1039304fd3cf565cf9de1ca45849 (patch)
tree3033fabde11d8757bf231ad8908b9dd854083fff /tests/gpgscm
parenttests: Remove debugging remnants. (diff)
downloadgnupg-06f1f163e96f1039304fd3cf565cf9de1ca45849.tar.gz
gnupg-06f1f163e96f1039304fd3cf565cf9de1ca45849.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]>
Diffstat (limited to 'tests/gpgscm')
-rw-r--r--tests/gpgscm/tests.scm8
1 files changed, 5 insertions, 3 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)