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.

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.

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 = t-data-1.txt t-data-2.txt
 
-EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc geheim.txt \
-	     pubkey-1.asc seckey-1.asc
-
-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}

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 
+
+
+
+
+
+
+

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
 {

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;

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", \

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", \

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", \

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; \

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", \

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", \

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", \

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", \

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";

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)

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 " \

tests/t-version.c

@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 static const char version[] = VERSION;