Add ECC import regression tests and fixed a regression.
[gnupg.git] / tests / openpgp / Makefile.am
index cf32bb9..8d6e590 100644 (file)
@@ -1,4 +1,6 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Makefile.am - For tests/openpgp
+# Copyright (C) 1998, 1999, 2000, 2001, 2003,
+#               2010 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -6,19 +8,25 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG 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, see <http://www.gnu.org/licenses/>.
 # Process this file with automake to create Makefile.in
 
-GPG_IMPORT = ../../g10/gpg2 --homedir . \
-              --quiet --yes --no-permission-warning --import
 
+# Programs required before we can run these tests.
+required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
+                ../../tools/gpg-connect-agent ../../tools/mk-tdata
+
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C
+
+# Note: version.test needs to be the first test to run and finish.test
+# the last one
 TESTS = version.test mds.test \
        decrypt.test decrypt-dsa.test \
        sigs.test sigs-dsa.test \
@@ -29,78 +37,49 @@ TESTS = version.test mds.test \
        armsignencrypt.test armdetach.test \
        armdetachm.test detachm.test genkey1024.test \
        conventional.test conventional-mdc.test \
-       multisig.test verify.test armor.test 
+       multisig.test verify.test armor.test \
+       import.test ecc.test finish.test
 
 
 TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
             plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
             pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc \
-             gpg.conf.tmpl bug537-test.data.asc
-
-DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large
-
-EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) \
-            mkdemodirs signdemokey
-CLEANFILES = prepared.stamp x y yy z out err  $(DATA_FILES) \
+             gpg.conf.tmpl gpg-agent.conf.tmpl \
+            bug537-test.data.asc bug894-test.asc \
+            bug1223-good.asc bug1223-bogus.asc
+
+data_files = data-500 data-9000 data-32000 data-80000 plain-large
+
+priv_keys = privkeys/50B2D4FA4122C212611048BC5FC31BD44393626E.asc \
+            privkeys/7E201E28B6FEB2927B321F443205F4724EBE637E.asc \
+            privkeys/13FDB8809B17C5547779F9D205C45F47CE0217CE.asc \
+            privkeys/343D8AF79796EE107D645A2787A9D9252F924E6F.asc \
+            privkeys/8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34.asc \
+            privkeys/0D6F6AD4C4C803B25470F9104E9F4E6A4CA64255.asc \
+            privkeys/FD692BD59D6640A84C8422573D469F84F3B98E53.asc \
+            privkeys/76F7E2B35832976B50A27A282D9B87E44577EB66.asc \
+            privkeys/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD.asc
+
+sample_keys = samplekeys/ecc-sample-1-pub.asc \
+              samplekeys/ecc-sample-2-pub.asc \
+              samplekeys/ecc-sample-3-pub.asc \
+              samplekeys/ecc-sample-1-sec.asc \
+              samplekeys/ecc-sample-2-sec.asc \
+              samplekeys/ecc-sample-3-sec.asc
+
+EXTRA_DIST = defs.inc pinentry.sh $(TESTS) $(TEST_FILES) \
+            mkdemodirs signdemokey $(priv_keys) $(sample_keys)
+
+CLEANFILES = prepared.stamp x y yy z out err  $(data_files) \
             plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
-            *.test.log gpg_dearmor gpg.conf \
-            pubring.gpg secring.gpg pubring.pkr secring.skr
-
-DISTCLEANFILES = pubring.gpg~ random_seed
-
-
-all-local: prepared.stamp
-
-distclean-local:
-       $(srcdir)/mkdemodirs --clean
-
-prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
-               ./pubring.pkr ./secring.skr ./gpg_dearmor $(DATA_FILES)
-        $(GPG_IMPORT) $(srcdir)/pubdemo.asc     
-        echo timestamp >./prepared.stamp
-
-./gpg_dearmor:
-       echo '#!/bin/sh' >./gpg_dearmor
-       echo "../../g10/gpg2 --no-options --no-greeting \
-             --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
-       chmod 755 ./gpg_dearmor
-
-./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
-       ./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
-
-./secring.gpg: $(srcdir)/secring.asc ./gpg_dearmor
-       ./gpg_dearmor > ./secring.gpg < $(srcdir)/secring.asc
-
-./pubring.pkr: $(srcdir)/pubring.pkr.asc ./gpg_dearmor
-       ./gpg_dearmor > ./pubring.pkr < $(srcdir)/pubring.pkr.asc
-
-./secring.skr: $(srcdir)/secring.skr.asc ./gpg_dearmor
-       ./gpg_dearmor > ./secring.skr < $(srcdir)/secring.skr.asc
-
-./plain-1: $(srcdir)/plain-1o.asc ./gpg_dearmor
-       ./gpg_dearmor > ./plain-1 < $(srcdir)/plain-1o.asc
-
-./plain-2: $(srcdir)/plain-2o.asc ./gpg_dearmor
-       ./gpg_dearmor > ./plain-2 < $(srcdir)/plain-2o.asc
-
-./plain-3: $(srcdir)/plain-3o.asc ./gpg_dearmor
-       ./gpg_dearmor > ./plain-3 < $(srcdir)/plain-3o.asc
-
+            *.test.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \
+            pubring.gpg secring.gpg pubring.pkr secring.skr \
+            gnupg-test.stop pubring.gpg~ random_seed gpg-agent.log
 
-data-500:
-       ../../tools/mk-tdata   500  >data-500
-data-9000:
-       ../../tools/mk-tdata  9000  >data-9000
-data-32000:
-       ../../tools/mk-tdata 32000  >data-32000
-data-80000:
-       ../../tools/mk-tdata 80000  >data-80000
-plain-large:
-       cat $(srcdir)/../../doc/HACKING \
-           $(srcdir)/../../doc/DETAILS \
-           $(srcdir)/../../doc/gpg.texi >plain-large
+clean-local:
+       -rm -rf private-keys-v1.d
 
-# To speed up key generation we create a dummy random seed file
-random_seed:
-       ../../tools/mk-tdata 600
 
+# We need to depend on a couple of programs so that the tests don't
+# start before all programs are built.
+all-local: $(required_pgms)