[git] GnuPG - branch, justus/scm-7, updated. gnupg-2.1.11-80-g007fdfe

[by Justus Winter]

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, justus/scm-7 has been updated
       via  007fdfe0f5a615ce5e9d62b272626c0112b1b1e1 (commit)
      from  b92212032f9b72bef274e336fc3be0335d267a28 (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 007fdfe0f5a615ce5e9d62b272626c0112b1b1e1
Author: Justus Winter <justus at g10code.com>
Date:   Wed Feb 24 14:48:46 2016 +0100

    tests/openpgp: Fix make check.

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 3437f1e..6f8859d 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -36,7 +36,9 @@ fake_pinentry_SOURCES = fake-pinentry.c
 
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) GPGSCM_PATH=$(top_srcdir)/tests/gpgscm:$(top_srcdir)/tests/openpgp
+	PATH=../gpgscm:$(PATH) \
+	objdir=$(shell readlink -f ../..) \
+	GPGSCM_PATH=$(top_srcdir)/tests/gpgscm:$(top_srcdir)/tests/openpgp
 
 if SQLITE3
 sqlite3_dependent_tests = tofu.test
diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index ffc9c90..7976a4c 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -1,6 +1,5 @@
 #!/usr/bin/env gpgscm
 
-(echo (getenv "GPGSCM_PATH"))
 (load (with-path "defs.scm"))
 
 (echo "Creating test environment...")
@@ -25,10 +24,10 @@
  '("gpg.conf" "gpg-agent.conf"))
 
 (echo "Starting gpg-agent...")
-(call `(,(tool 'gpg-connect-agent) --verbose
-	,(string-append "--agent-program=" (tool 'gpg-agent)
-			"|--debug-quick-random")
-	/bye))
+(call-check `(,(tool 'gpg-connect-agent) --verbose
+	      ,(string-append "--agent-program=" (tool 'gpg-agent)
+			      "|--debug-quick-random")
+	      /bye))
 
 (for-each-p "Creating sample data files"
   (lambda (size)

-----------------------------------------------------------------------

Summary of changes:
 tests/openpgp/Makefile.am | 4 +++-
 tests/openpgp/setup.scm   | 9 ++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org