[git] GnuPG - branch, master, updated. gnupg-2.2.1-77-g80b9045

[by NIIBE Yutaka]

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  80b904543486a2f12087bc34a6049ede4eb75940 (commit)
      from  a1fe3708d0894c138f6dd75d2a6bd22c64359172 (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 80b904543486a2f12087bc34a6049ede4eb75940
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Nov 13 18:50:30 2017 +0900

    tests: Handle the case with DISABLE_REGEX.
    
    * tests/openpgp/Makefile.am [DISABLE_REGEX] (EXTRA_DIST, XTESTS):
      Conditionalize.
    * tests/openpgp/all-tests.scm (all-tests): Input file is Makefile.
    
    --
    
    The feature is only valid with !DISABLE_REGEX.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 827d3e3..e5be42b 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -85,7 +85,6 @@ XTESTS = \
 	trust-pgp-1.scm \
 	trust-pgp-2.scm \
 	trust-pgp-3.scm \
-	trust-pgp-4.scm \
 	gpgtar.scm \
 	use-exact-key.scm \
 	default-key.scm \
@@ -277,6 +276,12 @@ CLEANFILES = prepared.stamp x y yy z out err  $(data_files) \
 	     gnupg-test.stop random_seed gpg-agent.log tofu.db \
 	     passphrases sshcontrol S.gpg-agent.ssh report.xml
 
+if DISABLE_REGEX
+EXTRA_DIST += trust-pgp-4.scm
+else
+XTESTS += trust-pgp-4.scm
+endif
+
 clean-local:
 	-rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d
 
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm
index d687fe4..e12b175 100644
--- a/tests/openpgp/all-tests.scm
+++ b/tests/openpgp/all-tests.scm
@@ -48,7 +48,7 @@
  (define setup-extended-key-format (setup* "extended-key-format"))
 
  (define all-tests
-   (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am")
+   (parse-makefile-expand "Makefile"
 			  (lambda (filename port key) (parse-makefile port key))
 			  "XTESTS"))
 

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

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


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