Merge branch 'STABLE-BRANCH-2-2' into master
[gnupg.git] / tests / gpgsm / Makefile.am
index aad328b..e54db78 100644 (file)
@@ -28,15 +28,12 @@ include $(top_srcdir)/am/cmacros.am
 
 AM_CFLAGS =
 
-TMP ?= /tmp
-
 TESTS_ENVIRONMENT = LC_ALL=C \
        EXEEXT=$(EXEEXT) \
        PATH=../gpgscm:$(PATH) \
-       TMP=$(TMP) \
-       srcdir=$(abs_srcdir) \
+       abs_top_srcdir=$(abs_top_srcdir) \
        objdir=$(abs_top_builddir) \
-       GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm:$(abs_top_srcdir)/tests/openpgp:$(abs_top_srcdir)/tests/gpgsm
+       GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
 
 XTESTS = \
        import.scm \
@@ -57,7 +54,7 @@ check: xcheck
 .PHONY: xcheck
 xcheck:
        $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
-         $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(XTESTS)
+         $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 KEYS = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 CERTS =        cert_g10code_test1.der \
@@ -69,9 +66,9 @@ TEST_FILES = plain-1.cms.asc \
        plain-large.cms.asc
 
 EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \
-       gpgsm-defs.scm run-tests.scm setup.scm
+       gpgsm-defs.scm run-tests.scm setup.scm all-tests.scm
 
-CLEANFILES = *.log
+CLEANFILES = *.log report.xml
 
 # We need to depend on a couple of programs so that the tests don't
 # start before all programs are built.