[git] GnuPG - branch, master, updated. gnupg-2.1.18-16-g5f2da5d

[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, master has been updated
       via  5f2da5d439debf44615a97de788d8f720b517972 (commit)
       via  6ecd8b3e71632bbcca524ad735c83bdc2a4c4a4a (commit)
      from  770b75a746836773909af25ccb9b480e61cea677 (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 5f2da5d439debf44615a97de788d8f720b517972
Author: Justus Winter <justus at g10code.com>
Date:   Wed Jan 25 11:18:23 2017 +0100

    tests: Skip GPGME tests that are not built.
    
    * tests/gpgme/wrap.scm: Skip tests that are not built.
    --
    Previously, all tests from GPGME's test suite that were not built
    (e.g. because GPGME was not configured with QT) were marked as
    failures.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgme/wrap.scm b/tests/gpgme/wrap.scm
index 4f3ae7d..e8f2b1f 100644
--- a/tests/gpgme/wrap.scm
+++ b/tests/gpgme/wrap.scm
@@ -56,5 +56,8 @@
     (log "Importing extra key...")
     (call-check `(, at GPG --yes --import ,(in-srcdir "pubkey-1.asc"))))))
 
-(log "Running" (car executable))
-(exit (run executable))
+(if (file-exists? (car executable))
+    (begin
+      (log "Running" (car executable))
+      (exit (run executable)))
+    (skip (car executable) "is not built"))

commit 6ecd8b3e71632bbcca524ad735c83bdc2a4c4a4a
Author: Justus Winter <justus at g10code.com>
Date:   Wed Jan 25 11:16:23 2017 +0100

    tests,w32: Fix locating GPGME's tests on Windows.
    
    * tests/gpgme/run-tests.scm: Qualify the test with the executable
    extension.
    --
    Previously, the test suite could not locate the test executables on
    Windows because the Windows-specific file extension was missing.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgme/run-tests.scm b/tests/gpgme/run-tests.scm
index bce5584..cb17977 100644
--- a/tests/gpgme/run-tests.scm
+++ b/tests/gpgme/run-tests.scm
@@ -54,7 +54,7 @@
 	     (apply path-join
 		    `(,(if (compiled? name)
 			   gpgme-builddir
-			   gpgme-srcdir) ,@(:path cmpnts),name)))
+			   gpgme-srcdir) ,@(:path cmpnts) ,(qualify name))))
 	   (let ((makefile (apply path-join `(,gpgme-srcdir ,@(:path cmpnts)
 							    "Makefile.am"))))
 	     (map (lambda (name)

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

Summary of changes:
 tests/gpgme/run-tests.scm | 2 +-
 tests/gpgme/wrap.scm      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)


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