2001-11-22 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 22 Nov 2001 03:01:26 +0000 (03:01 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 22 Nov 2001 03:01:26 +0000 (03:01 +0000)
* 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:
tests/ChangeLog
tests/Makefile.am
tests/gpg/Makefile.am [new file with mode: 0644]
tests/gpg/cipher-1.asc [moved from tests/cipher-1.asc with 100% similarity]
tests/gpg/cipher-2.asc [moved from tests/cipher-2.asc with 100% similarity]
tests/gpg/geheim.txt [moved from tests/geheim.txt with 100% similarity]
tests/gpg/mkdemodirs [moved from tests/mkdemodirs with 100% similarity]
tests/gpg/pubdemo.asc [moved from tests/pubdemo.asc with 100% similarity]
tests/gpg/pubkey-1.asc [moved from tests/pubkey-1.asc with 100% similarity]
tests/gpg/secdemo.asc [moved from tests/secdemo.asc with 100% similarity]
tests/gpg/seckey-1.asc [moved from tests/seckey-1.asc with 100% similarity]
tests/gpg/t-decrypt-verify.c [moved from tests/t-decrypt-verify.c with 99% similarity]
tests/gpg/t-decrypt.c [moved from tests/t-decrypt.c with 99% similarity]
tests/gpg/t-encrypt.c [moved from tests/t-encrypt.c with 99% similarity]
tests/gpg/t-export.c [moved from tests/t-export.c with 98% similarity]
tests/gpg/t-genkey.c [moved from tests/t-genkey.c with 98% similarity]
tests/gpg/t-import.c [moved from tests/t-import.c with 98% similarity]
tests/gpg/t-keylist.c [moved from tests/t-keylist.c with 99% similarity]
tests/gpg/t-sign.c [moved from tests/t-sign.c with 99% similarity]
tests/gpg/t-signers.c [moved from tests/t-signers.c with 99% similarity]
tests/gpg/t-trustlist.c [moved from tests/t-trustlist.c with 98% similarity]
tests/gpg/t-verify.c [moved from tests/t-verify.c with 99% similarity]
tests/gpgsm/Makefile.am [new file with mode: 0644]
tests/t-data.c
tests/t-version.c

index a57f662..61f67f9 100644 (file)
@@ -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.
index 6490698..b367917 100644 (file)
 
 ## 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 (file)
index 0000000..d313b3a
--- /dev/null
@@ -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 
+
+
+
+
+
+
+
similarity index 100%
rename from tests/cipher-1.asc
rename to tests/gpg/cipher-1.asc
similarity index 100%
rename from tests/cipher-2.asc
rename to tests/gpg/cipher-2.asc
similarity index 100%
rename from tests/geheim.txt
rename to tests/gpg/geheim.txt
similarity index 100%
rename from tests/mkdemodirs
rename to tests/gpg/mkdemodirs
similarity index 100%
rename from tests/pubdemo.asc
rename to tests/gpg/pubdemo.asc
similarity index 100%
rename from tests/pubkey-1.asc
rename to tests/gpg/pubkey-1.asc
similarity index 100%
rename from tests/secdemo.asc
rename to tests/gpg/secdemo.asc
similarity index 100%
rename from tests/seckey-1.asc
rename to tests/gpg/seckey-1.asc
similarity index 99%
rename from tests/t-decrypt-verify.c
rename to tests/gpg/t-decrypt-verify.c
index 1c1f143..c322f8d 100644 (file)
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <mcheck.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 struct passphrase_cb_info_s
 {
similarity index 99%
rename from tests/t-decrypt.c
rename to tests/gpg/t-decrypt.c
index af4c2d0..095cb82 100644 (file)
@@ -25,7 +25,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 struct passphrase_cb_info_s {
     GpgmeCtx c;
similarity index 99%
rename from tests/t-encrypt.c
rename to tests/gpg/t-encrypt.c
index 02ef11f..06736b3 100644 (file)
@@ -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", \
similarity index 98%
rename from tests/t-export.c
rename to tests/gpg/t-export.c
index ca0ee98..373e9f5 100644 (file)
@@ -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", \
similarity index 98%
rename from tests/t-genkey.c
rename to tests/gpg/t-genkey.c
index a330056..09206fb 100644 (file)
@@ -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", \
similarity index 98%
rename from tests/t-import.c
rename to tests/gpg/t-import.c
index 8054ed6..25ea20f 100644 (file)
@@ -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; \
similarity index 99%
rename from tests/t-keylist.c
rename to tests/gpg/t-keylist.c
index 9a81c12..1e06d86 100644 (file)
@@ -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", \
similarity index 99%
rename from tests/t-sign.c
rename to tests/gpg/t-sign.c
index 65822c9..ca9dc34 100644 (file)
@@ -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", \
similarity index 99%
rename from tests/t-signers.c
rename to tests/gpg/t-signers.c
index bdda2bc..c05ef18 100644 (file)
@@ -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", \
similarity index 98%
rename from tests/t-trustlist.c
rename to tests/gpg/t-trustlist.c
index aaa704a..a3c8152 100644 (file)
@@ -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", \
similarity index 99%
rename from tests/t-verify.c
rename to tests/gpg/t-verify.c
index 524a203..6b4a28e 100644 (file)
@@ -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 (file)
index 0000000..4419031
--- /dev/null
@@ -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)
index 90099df..f3c769f 100644 (file)
@@ -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 " \
index 7d50393..e674c2c 100644 (file)
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "../gpgme/gpgme.h"
+#include <gpgme.h>
 
 static const char version[] = VERSION;