security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

tests: Improve temporary directory handling.

Browse Source 
* tests/gpgscm/ffi.c (ffi_init): Rename 'mkdtemp'.
* tests/gpgscm/tests.scm (mkdtemp): New function that uses a sensible
location and template if no arguments are given.
(with-temporary-working-directory): Simplify accordingly.
(make-temporary-file): Likewise.
* tests/openpgp/run-tests.scm (run-tests-parallel-isolated): Likewise.
(run-tests-sequential-isolated): Likewise.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-08-10 11:54:11 +02:00
parent efe973dab7
commit d9240a3a46
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/gpgscm/ffi.c
View File

@ -1248,7 +1248,7 @@ ffi_init (scheme *sc, const char *argv0, int argc, const char **argv)
ffi_define_function (sc, open); ffi_define_function (sc, open);
ffi_define_function (sc, fdopen); ffi_define_function (sc, fdopen);
ffi_define_function (sc, close); ffi_define_function (sc, close);
ffi_define_function (sc, mkdtemp); ffi_define_function_name (sc, "_mkdtemp", mkdtemp);
ffi_define_function (sc, unlink); ffi_define_function (sc, unlink);
ffi_define_function (sc, unlink_recursively); ffi_define_function (sc, unlink_recursively);
ffi_define_function (sc, rename); ffi_define_function (sc, rename);

13
tests/gpgscm/tests.scm
View File

@ -247,10 +247,19 @@
(chdir ,cwd-sym) (chdir ,cwd-sym)
,result-sym))) ,result-sym)))
;; Make a temporary directory. If arguments are given, they are
;; joined using path-join, and must end in a component ending in
;; "XXXXXX". If no arguments are given, a suitable location and
;; generic name is used.
(define (mkdtemp . components)
(_mkdtemp (if (null? components)
(path-join (getenv "TMP") "gpgscm-XXXXXX")
(apply path-join components))))
(macro (with-temporary-working-directory form) (macro (with-temporary-working-directory form)
(let ((result-sym (gensym)) (cwd-sym (gensym)) (tmp-sym (gensym))) (let ((result-sym (gensym)) (cwd-sym (gensym)) (tmp-sym (gensym)))
`(let* ((,cwd-sym (getcwd)) `(let* ((,cwd-sym (getcwd))
(,tmp-sym (mkdtemp (path-join (getenv "TMP") "gpgscm-XXXXXX"))) (,tmp-sym (mkdtemp))
(_ (chdir ,tmp-sym)) (_ (chdir ,tmp-sym))
(,result-sym (begin ,@(cdr form)))) (,result-sym (begin ,@(cdr form))))
(chdir ,cwd-sym) (chdir ,cwd-sym)
@ -259,7 +268,7 @@
(define (make-temporary-file . args) (define (make-temporary-file . args)
(canonical-path (path-join (canonical-path (path-join
(mkdtemp (path-join (getenv "TMP") "gpgscm-XXXXXX")) (mkdtemp)
(if (null? args) "a" (car args))))) (if (null? args) "a" (car args)))))
(define (remove-temporary-file filename) (define (remove-temporary-file filename)

4
tests/openpgp/run-tests.scm
View File

@ -128,7 +128,7 @@
(unlink-recursively t::directory) (unlink-recursively t::directory)
(t::report)) results::procs) (t::report)) results::procs)
(exit (results::report))) (exit (results::report)))
(let* ((wd (mkdtemp "gpgscm-XXXXXX")) (let* ((wd (mkdtemp))
(test (car tests')) (test (car tests'))
(test' (test::set-directory wd)) (test' (test::set-directory wd))
(setup' (setup::set-directory wd))) (setup' (setup::set-directory wd)))
@ -154,7 +154,7 @@
(unlink-recursively t::directory)) (unlink-recursively t::directory))
results::procs) results::procs)
(exit (results::report))) (exit (results::report)))
(let* ((wd (mkdtemp "gpgscm-XXXXXX")) (let* ((wd (mkdtemp))
(test (car tests')) (test (car tests'))
(test' (test::set-directory wd)) (test' (test::set-directory wd))
(setup' (setup::set-directory wd))) (setup' (setup::set-directory wd)))