summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/ChangeLog5
-rw-r--r--tests/Makefile.am8
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index c7ce33dfe..e7e7c7f4b 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-06 Marcus Brinkmann <marcus@g10code.de>
+
+ * Makefile.am (openpgp): New variable.
+ (SUBDIRS): Conditionalize openpgp on RUN_GPG_TESTS.
+
2006-08-21 Werner Koch <wk@g10code.com>
* Makefile.am (SUBDIRS): New.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c4f7dd457..a3cfbbdda 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,7 +29,13 @@
#
#SUBDIRS = . ${pkits}
-SUBDIRS = openpgp
+if RUN_GPG_TESTS
+openpgp = openpgp
+else
+openpgp =
+endif
+
+SUBDIRS = ${openpgp}
GPGSM = ../sm/gpgsm