2001-11-22 Marcus Brinkmann <[email protected]>

	* gpg/: New directory.
	* Makefile.am, t-verify.c, t-encrypt.c, t-signers.c, t-trustlist.c,
	t-sign.c, t-keylist.c, t-import.c, t-genkey.c, t-export.c,
	t-decrypt-verify.c, t-decrypt.c, t-version.c, t-data.c, mkdemodirs.
	cipher-1.asc, cipher-2.asc, geheim.txt, pubdemo.asc, pubkey-1.asc,
	secdemo.asc, seckey-1.asc): Move to sub directory gpg/.

	* gpg/Makefile.am (INCLUDES): Include gpgme/, not include/ and
	intl/.
	(LDD): Correct relative path to gpgme library.
	(TESTS): Remove t-version and t-data.
	* gpg/t-verify.c, gpg/t-encrypt.c, gpg/t-signers.c, gpg/t-trustlist.c,
	gpg/t-sign.c, gpg/t-keylist.c, gpg/t-import.c, gpg/t-genkey.c,
	gpg/t-export.c, gpg/t-decrypt-verify.c, gpg/t-decrypt.c,
	t-version.c, t-data.c): Include gpgme.h, not "../gpgme/gpgme.h".

	* Makefile.am: New file.
	* gpgsm/: New directory.
	* gpgsm/Makefile.am: New file.

25 files changed, 141 insertions, 40 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a57f6625..61f67f9f 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,25 @@
+2001-11-22  Marcus Brinkmann  <[email protected]>
+
+	* gpg/: New directory.
+	* Makefile.am, t-verify.c, t-encrypt.c, t-signers.c, t-trustlist.c,
+	t-sign.c, t-keylist.c, t-import.c, t-genkey.c, t-export.c,
+	t-decrypt-verify.c, t-decrypt.c, t-version.c, t-data.c, mkdemodirs.
+	cipher-1.asc, cipher-2.asc, geheim.txt, pubdemo.asc, pubkey-1.asc,
+	secdemo.asc, seckey-1.asc): Move to sub directory gpg/.
+
+	* gpg/Makefile.am (INCLUDES): Include gpgme/, not include/ and
+	intl/.
+	(LDD): Correct relative path to gpgme library.
+	(TESTS): Remove t-version and t-data.
+	* gpg/t-verify.c, gpg/t-encrypt.c, gpg/t-signers.c, gpg/t-trustlist.c,
+	gpg/t-sign.c, gpg/t-keylist.c, gpg/t-import.c, gpg/t-genkey.c,
+	gpg/t-export.c, gpg/t-decrypt-verify.c, gpg/t-decrypt.c,
+	t-version.c, t-data.c): Include gpgme.h, not "../gpgme/gpgme.h".
+
+	* Makefile.am: New file.
+	* gpgsm/: New directory.
+	* gpgsm/Makefile.am: New file.
+
 2001-11-16  Marcus Brinkmann  <[email protected]>
 
 	* Makefile.am (TESTS): Add t-decrypt-verify.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 64906988..b3679179 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,40 +19,28 @@
 
 ## Process this file with automake to produce Makefile.in
 
-
 TESTS_ENVIRONMENT = GNUPGHOME=.
 
-TESTS = t-version t-data t-encrypt t-sign t-signers t-decrypt t-verify	\
-	t-decrypt-verify t-keylist t-export t-import t-trustlist
-
+TESTS = t-version t-data
 
-EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc geheim.txt \
-	     pubkey-1.asc seckey-1.asc
+EXTRA_DIST = t-data-1.txt t-data-2.txt
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
+INCLUDES = -I$(top_srcdir)/gpgme
 
 LDADD = ../gpgme/libgpgme.la
 
-# We don't run t-genkey in the test suite, because it taes too long
-noinst_PROGRAMS = $(TESTS) t-genkey
-
-distclean-local:
-	$(srcdir)/mkdemodirs --clean
-
-all-local: ./pubring.gpg ./secring.gpg
-
-./pubring.gpg: $(srcdir)/pubdemo.asc
-	-gpg --homedir . --import $(srcdir)/pubdemo.asc
-
-./secring.gpg: ./Alpha/Secret.gpg 
-	-gpg --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
-
-./Alpha/Secret.gpg: secdemo.asc 
-	srcdir=$(srcdir) $(srcdir)/mkdemodirs 
-
-
-
-
+noinst_PROGRAMS = $(TESTS)
 
+if RUN_GPG_TESTS
+gpgtests = gpg
+else
+gpgtests = 
+endif
 
+if RUN_GPGSM_TESTS
+gpgsmtests = gpgsm
+else
+gpgsmtests = 
+endif
 
+SUBDIRS = ${gpgtests} ${gpgsmtests}
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
new file mode 100644
index 00000000..d313b3ab
--- /dev/null
+++ b/tests/gpg/Makefile.am
@@ -0,0 +1,58 @@
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
+
+
+TESTS_ENVIRONMENT = GNUPGHOME=.
+
+TESTS = t-encrypt t-sign t-signers t-decrypt t-verify	\
+	t-decrypt-verify t-keylist t-export t-import t-trustlist
+
+
+EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc
+	geheim.txt pubkey-1.asc seckey-1.asc
+
+INCLUDES = -I$(top_srcdir)/gpgme
+
+LDADD = ../../gpgme/libgpgme.la
+
+# We don't run t-genkey in the test suite, because it taes too long
+noinst_PROGRAMS = $(TESTS) t-genkey
+
+distclean-local:
+	$(srcdir)/mkdemodirs --clean
+
+all-local: ./pubring.gpg ./secring.gpg
+
+./pubring.gpg: $(srcdir)/pubdemo.asc
+	-gpg --homedir . --import $(srcdir)/pubdemo.asc
+
+./secring.gpg: ./Alpha/Secret.gpg 
+	-gpg --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
+
+./Alpha/Secret.gpg: secdemo.asc 
+	srcdir=$(srcdir) $(srcdir)/mkdemodirs 
+
+
+
+
+
+
+
diff --git a/tests/cipher-1.asc b/tests/gpg/cipher-1.asc
index f0a8ca45..f0a8ca45 100644
--- a/tests/cipher-1.asc
+++ b/tests/gpg/cipher-1.asc
diff --git a/tests/cipher-2.asc b/tests/gpg/cipher-2.asc
index 210f3e97..210f3e97 100644
--- a/tests/cipher-2.asc
+++ b/tests/gpg/cipher-2.asc
diff --git a/tests/geheim.txt b/tests/gpg/geheim.txt
index 99a54788..99a54788 100644
--- a/tests/geheim.txt
+++ b/tests/gpg/geheim.txt
diff --git a/tests/mkdemodirs b/tests/gpg/mkdemodirs
index 7c3bd047..7c3bd047 100755
--- a/tests/mkdemodirs
+++ b/tests/gpg/mkdemodirs
diff --git a/tests/pubdemo.asc b/tests/gpg/pubdemo.asc
index d550f1af..d550f1af 100644
--- a/tests/pubdemo.asc
+++ b/tests/gpg/pubdemo.asc
diff --git a/tests/pubkey-1.asc b/tests/gpg/pubkey-1.asc
index bed1da3a..bed1da3a 100644
--- a/tests/pubkey-1.asc
+++ b/tests/gpg/pubkey-1.asc
diff --git a/tests/secdemo.asc b/tests/gpg/secdemo.asc
index 343453c4..343453c4 100644
--- a/tests/secdemo.asc
+++ b/tests/gpg/secdemo.asc
diff --git a/tests/seckey-1.asc b/tests/gpg/seckey-1.asc
index 39348049..39348049 100644
--- a/tests/seckey-1.asc
+++ b/tests/gpg/seckey-1.asc
diff --git a/tests/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index 1c1f143e..c322f8d2 100644
--- a/tests/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <mcheck.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 struct passphrase_cb_info_s
 {
diff --git a/tests/t-decrypt.c b/tests/gpg/t-decrypt.c
index af4c2d08..095cb82c 100644
--- a/tests/t-decrypt.c
+++ b/tests/gpg/t-decrypt.c
@@ -25,7 +25,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 struct passphrase_cb_info_s {
     GpgmeCtx c;
diff --git a/tests/t-encrypt.c b/tests/gpg/t-encrypt.c
index 02ef11fa..06736b3a 100644
--- a/tests/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
                                fprintf (stderr, "%s:%d: GpgmeError %s\n", \
diff --git a/tests/t-export.c b/tests/gpg/t-export.c
index ca0ee985..373e9f5c 100644
--- a/tests/t-export.c
+++ b/tests/gpg/t-export.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
                                fprintf (stderr, "%s:%d: GpgmeError %s\n", \
diff --git a/tests/t-genkey.c b/tests/gpg/t-genkey.c
index a3300567..09206fb4 100644
--- a/tests/t-genkey.c
+++ b/tests/gpg/t-genkey.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
                                fprintf (stderr, "%s:%d: GpgmeError %s\n", \
diff --git a/tests/t-import.c b/tests/gpg/t-import.c
index 8054ed61..25ea20f5 100644
--- a/tests/t-import.c
+++ b/tests/gpg/t-import.c
@@ -25,7 +25,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 
 #define fail_if_err(a) do { if(a) { int my_errno = errno; \
diff --git a/tests/t-keylist.c b/tests/gpg/t-keylist.c
index 9a81c120..1e06d86f 100644
--- a/tests/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
                                fprintf (stderr, "%s:%d: GpgmeError %s\n", \
diff --git a/tests/t-sign.c b/tests/gpg/t-sign.c
index 65822c9d..ca9dc341 100644
--- a/tests/t-sign.c
+++ b/tests/gpg/t-sign.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
                                fprintf (stderr, "%s:%d: GpgmeError %s\n", \
diff --git a/tests/t-signers.c b/tests/gpg/t-signers.c
index bdda2bce..c05ef182 100644
--- a/tests/t-signers.c
+++ b/tests/gpg/t-signers.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
                                fprintf (stderr, "%s:%d: GpgmeError %s\n", \
diff --git a/tests/t-trustlist.c b/tests/gpg/t-trustlist.c
index aaa704a1..a3c8152b 100644
--- a/tests/t-trustlist.c
+++ b/tests/gpg/t-trustlist.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
                                fprintf (stderr, "%s:%d: GpgmeError %s\n", \
diff --git a/tests/t-verify.c b/tests/gpg/t-verify.c
index 524a203e..6b4a28e6 100644
--- a/tests/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 static const char test_text1[] = "Just GNU it!\n";
 static const char test_text1f[]= "Just GNU it?\n";
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
new file mode 100644
index 00000000..44190313
--- /dev/null
+++ b/tests/gpgsm/Makefile.am
@@ -0,0 +1,33 @@
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
+
+
+TESTS_ENVIRONMENT = GNUPGHOME=.
+
+TESTS = 
+
+#EXTRA_DIST =
+
+INCLUDES = -I$(top_srcdir)/gpgme
+
+LDADD = ../../gpgme/libgpgme.la
+
+noinst_PROGRAMS = $(TESTS)
diff --git a/tests/t-data.c b/tests/t-data.c
index 90099df7..f3c769f6 100644
--- a/tests/t-data.c
+++ b/tests/t-data.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
                                fprintf (stderr, "%s:%d: (%i) GpgmeError " \
diff --git a/tests/t-version.c b/tests/t-version.c
index 7d50393a..e674c2c0 100644
--- a/tests/t-version.c
+++ b/tests/t-version.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 static const char version[] = VERSION;