[git] GnuPG - branch, master, updated. gnupg-2.1.14-64-g194b1e9
by Justus Winter
cvs at cvs.gnupg.org
Wed Aug 10 12:09:52 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 194b1e979c7c547afd0dfea5b2496bdfa34b20f1 (commit)
via d9240a3a4688c263632b4168ae2e04363bc91a3a (commit)
via efe973dab7f69e2b1309446b2fbcd47ce0305399 (commit)
from e13f1ea8fff3964dc3008432f5c0f26aaa2eaa35 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 194b1e979c7c547afd0dfea5b2496bdfa34b20f1
Author: Justus Winter <justus at g10code.com>
Date: Wed Aug 10 11:52:49 2016 +0200
tests: Fix distcheck.
* tests/openpgp/Makefile.am (EXTRA_DIST): Explicitly add setup and
teardown scripts now that they no longer are included in the list of
tests.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index a43f23b..da12cae 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -170,7 +170,8 @@ sample_msgs = samplemsgs/issue2419.asc
EXTRA_DIST = defs.inc defs.scm pinentry.sh $(XTESTS) $(TEST_FILES) \
mkdemodirs signdemokey $(priv_keys) $(sample_keys) \
- $(sample_msgs) ChangeLog-2011 run-tests.scm
+ $(sample_msgs) ChangeLog-2011 run-tests.scm \
+ setup.scm finish.scm
CLEANFILES = prepared.stamp x y yy z out err $(data_files) \
plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
commit d9240a3a4688c263632b4168ae2e04363bc91a3a
Author: Justus Winter <justus at g10code.com>
Date: Wed Aug 10 11:54:11 2016 +0200
tests: Improve temporary directory handling.
* 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 at g10code.com>
diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index c37bf1d..57de286 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -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, fdopen);
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_recursively);
ffi_define_function (sc, rename);
diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index f97b22e..8283eba 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -247,10 +247,19 @@
(chdir ,cwd-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)
(let ((result-sym (gensym)) (cwd-sym (gensym)) (tmp-sym (gensym)))
`(let* ((,cwd-sym (getcwd))
- (,tmp-sym (mkdtemp (path-join (getenv "TMP") "gpgscm-XXXXXX")))
+ (,tmp-sym (mkdtemp))
(_ (chdir ,tmp-sym))
(,result-sym (begin ,@(cdr form))))
(chdir ,cwd-sym)
@@ -259,7 +268,7 @@
(define (make-temporary-file . args)
(canonical-path (path-join
- (mkdtemp (path-join (getenv "TMP") "gpgscm-XXXXXX"))
+ (mkdtemp)
(if (null? args) "a" (car args)))))
(define (remove-temporary-file filename)
diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm
index 367c641..e3b6b6a 100644
--- a/tests/openpgp/run-tests.scm
+++ b/tests/openpgp/run-tests.scm
@@ -128,7 +128,7 @@
(unlink-recursively t::directory)
(t::report)) results::procs)
(exit (results::report)))
- (let* ((wd (mkdtemp "gpgscm-XXXXXX"))
+ (let* ((wd (mkdtemp))
(test (car tests'))
(test' (test::set-directory wd))
(setup' (setup::set-directory wd)))
@@ -154,7 +154,7 @@
(unlink-recursively t::directory))
results::procs)
(exit (results::report)))
- (let* ((wd (mkdtemp "gpgscm-XXXXXX"))
+ (let* ((wd (mkdtemp))
(test (car tests'))
(test' (test::set-directory wd))
(setup' (setup::set-directory wd)))
commit efe973dab7f69e2b1309446b2fbcd47ce0305399
Author: Justus Winter <justus at g10code.com>
Date: Wed Aug 10 11:50:12 2016 +0200
gpgscm: Make the name of foreign functions more unique.
* tests/gpgscm/ffi-private.h (ffi_define_function_name): Add another
underscore.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/gpgscm/ffi-private.h b/tests/gpgscm/ffi-private.h
index 87f491f..0d58c41 100644
--- a/tests/gpgscm/ffi-private.h
+++ b/tests/gpgscm/ffi-private.h
@@ -93,7 +93,7 @@ pointer ffi_sprintf (scheme *sc, const char *format, ...)
#define ffi_define_function_name(SC, NAME, F) \
do { \
- char *_fname = ffi_schemify_name ("_" #F, 0); \
+ char *_fname = ffi_schemify_name ("__" #F, 0); \
scheme_define ((SC), \
(SC)->global_env, \
mk_symbol ((SC), _fname), \
-----------------------------------------------------------------------
Summary of changes:
tests/gpgscm/ffi-private.h | 2 +-
tests/gpgscm/ffi.c | 2 +-
tests/gpgscm/tests.scm | 13 +++++++++++--
tests/openpgp/Makefile.am | 3 ++-
tests/openpgp/run-tests.scm | 4 ++--
5 files changed, 17 insertions(+), 7 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list