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 59f39e2..58e1c2a 100644 (file)
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -38,6 +38,8 @@ TESTS_ENVIRONMENT = LC_ALL=C \
        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 = \
@@ -85,6 +87,7 @@ 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 \
@@ -102,9 +105,6 @@ XTESTS = \
        issue2929.scm \
        issue2941.scm
 
-# Temporary removed tests:
-#      trust-pgp-4.scm
-
 
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
@@ -116,7 +116,7 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
-       $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
+       $(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 \
@@ -268,19 +268,17 @@ sample_msgs = samplemsgs/clearsig-1-key-1.asc \
 
 EXTRA_DIST = defs.scm trust-pgp/common.scm $(XTESTS) $(TEST_FILES) \
             mkdemodirs signdemokey $(priv_keys) $(sample_keys)   \
-            $(sample_msgs) ChangeLog-2011 run-tests.scm trust-pgp-4.scm \
+            $(sample_msgs) ChangeLog-2011 run-tests.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 report.xml
 
-XTESTS += trust-pgp-4.scm
-
 clean-local:
        -rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d