Imported Upstream version 2.3.8

[platform/upstream/gpg2.git] / tests / openpgp / Makefile.am

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 40f947b..58e1c2a 100644 (file)
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -35,10 +35,12 @@ fake_pinentry_SOURCES = fake-pinentry.c
 
 TESTS_ENVIRONMENT = LC_ALL=C \
        EXEEXT=$(EXEEXT) \
-       PATH=../gpgscm:$(PATH) \
-       srcdir=$(abs_srcdir) \
-       objdir=$(abs_top_builddir) \
-       GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm:$(abs_top_srcdir)/tests/openpgp
+       PATH="../gpgscm:$(PATH)" \
+       abs_top_srcdir="$(abs_top_srcdir)" \
+       objdir="$(abs_top_builddir)" \
+        GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
+       GNUPG_IN_TEST_SUITE=fact \
+       GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = \
        version.scm \
@@ -74,6 +76,7 @@ XTESTS = \
        multisig.scm \
        verify.scm \
        verify-multifile.scm \
+       gpgv.scm \
        gpgv-forged-keyring.scm \
        armor.scm \
        import.scm \
@@ -81,6 +84,10 @@ XTESTS = \
        ecc.scm \
        4gb-packet.scm \
        tofu.scm \
+       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 \
@@ -98,6 +105,7 @@ XTESTS = \
        issue2929.scm \
        issue2941.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
@@ -108,14 +116,13 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
-       $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
-         run-tests.scm $(TESTFLAGS) $(XTESTS)
+       $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
+         $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 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 \
             plain-largeo.asc plain-large.asc \
             pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc \
-             gpg.conf.tmpl gpg-agent.conf.tmpl \
             bug537-test.data.asc bug894-test.asc \
             bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
             tofu/conflicting/1C005AF3.gpg \
@@ -158,7 +165,18 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
             key-selection/1.asc \
             key-selection/2.asc \
             key-selection/3.asc \
-            key-selection/4.asc
+            key-selection/4.asc \
+            trust-pgp/scenario1.asc \
+            trust-pgp/scenario2.asc \
+            trust-pgp/scenario3.asc \
+            trust-pgp/scenario4.asc \
+            trust-pgp/alice.sec.asc \
+            trust-pgp/bobby.sec.asc \
+            trust-pgp/carol.sec.asc \
+            trust-pgp/david.sec.asc \
+            trust-pgp/frank.sec.asc \
+            trust-pgp/grace.sec.asc \
+            trust-pgp/heidi.sec.asc
 
 data_files = data-500 data-9000 data-32000 data-80000 plain-large
 
@@ -248,18 +266,18 @@ sample_msgs = samplemsgs/clearsig-1-key-1.asc \
              samplemsgs/signed-2-keys-1.asc \
              samplemsgs/signed-2-keys-2.asc
 
-EXTRA_DIST = defs.scm $(XTESTS) $(TEST_FILES) \
+EXTRA_DIST = defs.scm trust-pgp/common.scm $(XTESTS) $(TEST_FILES) \
             mkdemodirs signdemokey $(priv_keys) $(sample_keys)   \
             $(sample_msgs) ChangeLog-2011 run-tests.scm \
-            setup.scm shell.scm
+            setup.scm shell.scm all-tests.scm signed-messages.scm
 
 CLEANFILES = prepared.stamp x y yy z out err  $(data_files) \
             plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
             *.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \
             pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \
-            secring.gpg pubring.pkr secring.skr \
+            common.conf secring.gpg pubring.pkr secring.skr \
             gnupg-test.stop random_seed gpg-agent.log tofu.db \
-            passphrases sshcontrol S.gpg-agent.ssh
+            passphrases sshcontrol S.gpg-agent.ssh report.xml
 
 clean-local:
        -rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d