[git] GnuPG - branch, master, updated. gnupg-2.1.14-61-ge13f1ea
by Justus Winter
cvs at cvs.gnupg.org
Wed Aug 10 09:43:16 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 e13f1ea8fff3964dc3008432f5c0f26aaa2eaa35 (commit)
via b2b21580b68f3a9069562f99675b389a0d044713 (commit)
from f14795d57f6c81709e9225dd3c5dfd3495cf1b2b (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 e13f1ea8fff3964dc3008432f5c0f26aaa2eaa35
Author: Justus Winter <justus at g10code.com>
Date: Wed Aug 10 09:32:53 2016 +0200
tests: Run each test in a clean environment.
* tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Drop obsolete
variables, add 'srcdir', use absolute paths.
(TESTS): Rename to 'XTESTS' to avoid emitting the automake test
runner. Drop 'setup.scm' and 'finish.scm'.
(xcheck): New target that runs 'run-tests.scm', our Scheme test suite
runner. It will run each test in a clean environment, isolated from
the other tests.
(EXTRA_DIST): Adapt accordingly.
* tests/openpgp/README: Likewise.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 564439a..a43f23b 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -36,16 +36,15 @@ fake_pinentry_SOURCES = fake-pinentry.c
TMP ?= /tmp
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C \
+TESTS_ENVIRONMENT = LC_ALL=C \
EXEEXT=$(EXEEXT) \
PATH=../gpgscm:$(PATH) \
TMP=$(TMP) \
+ srcdir=$(abs_srcdir) \
objdir=$(abs_top_builddir) \
- GPGSCM_PATH=$(top_srcdir)/tests/gpgscm:$(top_srcdir)/tests/openpgp
+ GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm:$(abs_top_srcdir)/tests/openpgp
-# Note: setup.scm needs to be the first test to run and finish.scm
-# the last one
-TESTS = setup.scm \
+XTESTS = \
version.scm \
mds.scm \
decrypt.scm \
@@ -85,9 +84,20 @@ TESTS = setup.scm \
ssh.scm \
issue2015.scm \
issue2346.scm \
- issue2419.scm \
- finish.scm
+ issue2419.scm
+# XXX: Currently, one cannot override automake's 'check' target. As a
+# workaround, we avoid defining 'TESTS', thus automake will not emit
+# the 'check' target. For extra robustness, we merely define a
+# dependency on 'xcheck', so this hack should also work even if
+# automake would emit the 'check' target, as adding dependencies to
+# targets is okay.
+check: xcheck
+
+.PHONY: xcheck
+xcheck:
+ $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
+ run-tests.scm $(XTESTS)
TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
@@ -158,7 +168,7 @@ sample_keys = samplekeys/README \
sample_msgs = samplemsgs/issue2419.asc
-EXTRA_DIST = defs.inc defs.scm pinentry.sh $(TESTS) $(TEST_FILES) \
+EXTRA_DIST = defs.inc defs.scm pinentry.sh $(XTESTS) $(TEST_FILES) \
mkdemodirs signdemokey $(priv_keys) $(sample_keys) \
$(sample_msgs) ChangeLog-2011 run-tests.scm
diff --git a/tests/openpgp/README b/tests/openpgp/README
index 1f8654b..9b384be 100644
--- a/tests/openpgp/README
+++ b/tests/openpgp/README
@@ -8,7 +8,7 @@ On POSIX you can just use
or
- $ make -C tests/openpgp check TESTS="setup.scm your-test.scm finish.scm"
+ $ make -C tests/openpgp check XTESTS="setup.scm your-test.scm finish.scm"
as before.
** using the Scheme driver
commit b2b21580b68f3a9069562f99675b389a0d044713
Author: Justus Winter <justus at g10code.com>
Date: Wed Aug 10 07:58:24 2016 +0200
tests: Make ssh test more robust.
* tests/openpgp/ssh.scm: Drop the 'MD5:' which was not printed by
previous ssh versions.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/openpgp/ssh.scm b/tests/openpgp/ssh.scm
index dfa1f52..1fe2e5d 100755
--- a/tests/openpgp/ssh.scm
+++ b/tests/openpgp/ssh.scm
@@ -33,10 +33,10 @@
(path-expand "ssh-add" (string-split (getenv "PATH") *pathsep*))))
(define keys
- '(("dsa" "MD5:9a:e1:f1:5f:46:ea:a5:06:e1:e2:f8:38:8e:06:54:58")
- ("rsa" "MD5:c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22")
- ("ecdsa" "MD5:93:37:30:a6:4e:e7:6a:22:79:77:8e:bf:ed:14:e9:8e")
- ("ed25519" "MD5:08:df:be:af:d2:f5:32:20:3a:1c:56:06:be:31:0f:bf")))
+ '(("dsa" "9a:e1:f1:5f:46:ea:a5:06:e1:e2:f8:38:8e:06:54:58")
+ ("rsa" "c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22")
+ ("ecdsa" "93:37:30:a6:4e:e7:6a:22:79:77:8e:bf:ed:14:e9:8e")
+ ("ed25519" "08:df:be:af:d2:f5:32:20:3a:1c:56:06:be:31:0f:bf")))
(for-each-p'
"Importing ssh keys..."
@@ -62,5 +62,5 @@
(pipe:spawn `(,SSH-ADD -)))
(unless
(string-contains? (call-popen `(,SSH-ADD -l "-E" md5) "")
- "MD5:c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22")
+ "c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22")
(error "known private key not (re-)added to sshcontrol"))
-----------------------------------------------------------------------
Summary of changes:
tests/openpgp/Makefile.am | 26 ++++++++++++++++++--------
tests/openpgp/README | 2 +-
tests/openpgp/ssh.scm | 10 +++++-----
3 files changed, 24 insertions(+), 14 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list