2001-11-22 Marcus Brinkmann <marcus@g10code.de>

	* 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.

diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog
index a57f6625edec712b43dd749aa3f70d3cbda27884..61f67f9f3d90eb47bbbee9a1097ac9cd565cf306 100644 (file)
--- a/trunk/tests/ChangeLog
+++ b/trunk/tests/ChangeLog
@@ -1,3 +1,25 @@
+2001-11-22  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <marcus@g10code.de>
 
        * Makefile.am (TESTS): Add t-decrypt-verify.

diff --git a/trunk/tests/Makefile.am b/trunk/tests/Makefile.am
index 64906988139565efd7c5d551a11ea8e38f18fb40..b3679179b7b0ced75ef079df198829b5db293339 100644 (file)
--- a/trunk/tests/Makefile.am
+++ b/trunk/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/trunk/tests/gpg/Makefile.am b/trunk/tests/gpg/Makefile.am
new file mode 100644 (file)
index 0000000..d313b3a
--- /dev/null
+++ b/trunk/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/trunk/tests/cipher-1.asc b/trunk/tests/gpg/cipher-1.asc
similarity index 100%
rename from trunk/tests/cipher-1.asc
rename to trunk/tests/gpg/cipher-1.asc

diff --git a/trunk/tests/cipher-2.asc b/trunk/tests/gpg/cipher-2.asc
similarity index 100%
rename from trunk/tests/cipher-2.asc
rename to trunk/tests/gpg/cipher-2.asc

diff --git a/trunk/tests/geheim.txt b/trunk/tests/gpg/geheim.txt
similarity index 100%
rename from trunk/tests/geheim.txt
rename to trunk/tests/gpg/geheim.txt

diff --git a/trunk/tests/mkdemodirs b/trunk/tests/gpg/mkdemodirs
similarity index 100%
rename from trunk/tests/mkdemodirs
rename to trunk/tests/gpg/mkdemodirs

diff --git a/trunk/tests/pubdemo.asc b/trunk/tests/gpg/pubdemo.asc
similarity index 100%
rename from trunk/tests/pubdemo.asc
rename to trunk/tests/gpg/pubdemo.asc

diff --git a/trunk/tests/pubkey-1.asc b/trunk/tests/gpg/pubkey-1.asc
similarity index 100%
rename from trunk/tests/pubkey-1.asc
rename to trunk/tests/gpg/pubkey-1.asc

diff --git a/trunk/tests/secdemo.asc b/trunk/tests/gpg/secdemo.asc
similarity index 100%
rename from trunk/tests/secdemo.asc
rename to trunk/tests/gpg/secdemo.asc

diff --git a/trunk/tests/seckey-1.asc b/trunk/tests/gpg/seckey-1.asc
similarity index 100%
rename from trunk/tests/seckey-1.asc
rename to trunk/tests/gpg/seckey-1.asc

diff --git a/trunk/tests/t-decrypt-verify.c b/trunk/tests/gpg/t-decrypt-verify.c
similarity index 99%
rename from trunk/tests/t-decrypt-verify.c
rename to trunk/tests/gpg/t-decrypt-verify.c
index 1c1f143e1990401c304a968eac65d834d7f76380..c322f8d20a4aa2a7f64fde1a1a416f7ac2d0fe8b 100644 (file)
--- a/trunk/tests/t-decrypt-verify.c
+++ b/trunk/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/trunk/tests/t-decrypt.c b/trunk/tests/gpg/t-decrypt.c
similarity index 99%
rename from trunk/tests/t-decrypt.c
rename to trunk/tests/gpg/t-decrypt.c
index af4c2d089893016ad6b6b00b53f89cf11aaaa21d..095cb82c7d89484022fca542ec03dd7f234d89c6 100644 (file)
--- a/trunk/tests/t-decrypt.c
+++ b/trunk/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/trunk/tests/t-encrypt.c b/trunk/tests/gpg/t-encrypt.c
similarity index 99%
rename from trunk/tests/t-encrypt.c
rename to trunk/tests/gpg/t-encrypt.c
index 02ef11fa4e4ea9d7f25711dcd31e7d172ffd0827..06736b3ab425007582bf63debe79595de6600fee 100644 (file)
--- a/trunk/tests/t-encrypt.c
+++ b/trunk/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/trunk/tests/t-export.c b/trunk/tests/gpg/t-export.c
similarity index 98%
rename from trunk/tests/t-export.c
rename to trunk/tests/gpg/t-export.c
index ca0ee985df13ddeb985528bc975c9d536a883d28..373e9f5ca3548584fd8409c4fb1303e15d866940 100644 (file)
--- a/trunk/tests/t-export.c
+++ b/trunk/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/trunk/tests/t-genkey.c b/trunk/tests/gpg/t-genkey.c
similarity index 98%
rename from trunk/tests/t-genkey.c
rename to trunk/tests/gpg/t-genkey.c
index a330056774fd4280278424fa914672d04915454e..09206fb4ddc2389e1e12d922ce347ab814426b2e 100644 (file)
--- a/trunk/tests/t-genkey.c
+++ b/trunk/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/trunk/tests/t-import.c b/trunk/tests/gpg/t-import.c
similarity index 98%
rename from trunk/tests/t-import.c
rename to trunk/tests/gpg/t-import.c
index 8054ed61aa2f5e571ff8e8b08c92e90c863853f5..25ea20f5e9e6cb414189fc7913a9256f31f3149e 100644 (file)
--- a/trunk/tests/t-import.c
+++ b/trunk/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/trunk/tests/t-keylist.c b/trunk/tests/gpg/t-keylist.c
similarity index 99%
rename from trunk/tests/t-keylist.c
rename to trunk/tests/gpg/t-keylist.c
index 9a81c1206ddac0a8dfab97aae620f41d669f35cc..1e06d86fd16a7729aae2cbff5f1bb40cc55afb86 100644 (file)
--- a/trunk/tests/t-keylist.c
+++ b/trunk/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/trunk/tests/t-sign.c b/trunk/tests/gpg/t-sign.c
similarity index 99%
rename from trunk/tests/t-sign.c
rename to trunk/tests/gpg/t-sign.c
index 65822c9dba3ce9c5849bcdb2ec8e527970df8654..ca9dc34105ad5343cdea4675b70c381b33ec4418 100644 (file)
--- a/trunk/tests/t-sign.c
+++ b/trunk/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/trunk/tests/t-signers.c b/trunk/tests/gpg/t-signers.c
similarity index 99%
rename from trunk/tests/t-signers.c
rename to trunk/tests/gpg/t-signers.c
index bdda2bcef36f5eb52e076cb20b30c3647640c201..c05ef1826f1e40e722bde1e20fcac08c76faef0d 100644 (file)
--- a/trunk/tests/t-signers.c
+++ b/trunk/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/trunk/tests/t-trustlist.c b/trunk/tests/gpg/t-trustlist.c
similarity index 98%
rename from trunk/tests/t-trustlist.c
rename to trunk/tests/gpg/t-trustlist.c
index aaa704a115cd7f37402a9b3873da94fe559e80ae..a3c8152bb2d6014cef6330882c85922fa7a2ff67 100644 (file)
--- a/trunk/tests/t-trustlist.c
+++ b/trunk/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/trunk/tests/t-verify.c b/trunk/tests/gpg/t-verify.c
similarity index 99%
rename from trunk/tests/t-verify.c
rename to trunk/tests/gpg/t-verify.c
index 524a203e605883d204a117b6b591100e697550e6..6b4a28e634e5535f653c54a411a7d5eae68f77d4 100644 (file)
--- a/trunk/tests/t-verify.c
+++ b/trunk/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/trunk/tests/gpgsm/Makefile.am b/trunk/tests/gpgsm/Makefile.am
new file mode 100644 (file)
index 0000000..4419031
--- /dev/null
+++ b/trunk/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/trunk/tests/t-data.c b/trunk/tests/t-data.c
index 90099df7604e18844c9142639e41881c57099d6d..f3c769f6ad125008289e38a845c1bbf170fc35a9 100644 (file)
--- a/trunk/tests/t-data.c
+++ b/trunk/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/trunk/tests/t-version.c b/trunk/tests/t-version.c
index 7d50393aaeb9016eb3a98388944dee262a5a3729..e674c2c0287e3a64c2293edc22311633b70915ee 100644 (file)
--- a/trunk/tests/t-version.c
+++ b/trunk/tests/t-version.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 static const char version[] = VERSION;