Add ECC import regression tests and fixed a regression.
[gnupg.git] / tests / openpgp / Makefile.am
index 9ea2237..8d6e590 100644 (file)
@@ -8,12 +8,12 @@
 # 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
@@ -38,7 +38,7 @@ TESTS = version.test mds.test \
        armdetachm.test detachm.test genkey1024.test \
        conventional.test conventional-mdc.test \
        multisig.test verify.test armor.test \
-       import.test finish.test 
+       import.test ecc.test finish.test
 
 
 TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
@@ -60,22 +60,26 @@ priv_keys = privkeys/50B2D4FA4122C212611048BC5FC31BD44393626E.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 $(TESTS) $(TEST_FILES) \
-            mkdemodirs signdemokey $(priv_keys)
+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 gpg-agent.conf S.gpg-agent \
             pubring.gpg secring.gpg pubring.pkr secring.skr \
-            gnupg-test.stop
+            gnupg-test.stop pubring.gpg~ random_seed gpg-agent.log
+
+clean-local:
+       -rm -rf private-keys-v1.d
 
-DISTCLEANFILES = pubring.gpg~ random_seed
 
 # 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)
-
-distclean-local:
-       $(srcdir)/mkdemodirs --clean
-