test: Extend TOFU tests to also check the days with signatures.
[gnupg.git] / tests / openpgp / Makefile.am
index bb1047d..0670531 100644 (file)
 # 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/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 # Process this file with automake to create Makefile.in
 
 
 # Programs required before we can run these tests.
 required_pgms = ../../g10/gpg$(EXEEXT) ../../agent/gpg-agent$(EXEEXT) \
                 ../../tools/gpg-connect-agent$(EXEEXT) \
-               ../../tools/mk-tdata$(EXEEXT)
+               ../gpgscm/gpgscm$(EXEEXT)
 
 AM_CPPFLAGS = -I$(top_srcdir)/common
 include $(top_srcdir)/am/cmacros.am
@@ -33,33 +33,81 @@ noinst_PROGRAMS = fake-pinentry
 
 fake_pinentry_SOURCES = fake-pinentry.c
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C
-
-if SQLITE3
-sqlite3_dependent_tests = tofu.test
-else
-sqlite3_dependent_tests =
-endif
-
-# 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 \
-       encrypt.test encrypt-dsa.test  \
-       seat.test clearsig.test encryptp.test detach.test \
-       armsigs.test armencrypt.test armencryptp.test \
-       signencrypt.test signencrypt-dsa.test \
-       armsignencrypt.test armdetach.test \
-       armdetachm.test detachm.test genkey1024.test \
-       conventional.test conventional-mdc.test \
-       multisig.test verify.test armor.test \
-       import.test ecc.test 4gb-packet.test \
-       $(sqlite3_dependent_tests) \
-       gpgtar.test use-exact-key.test default-key.test \
-       export.test \
-       finish.test
-
+TMP ?= /tmp
+
+TESTS_ENVIRONMENT = LC_ALL=C \
+       EXEEXT=$(EXEEXT) \
+       PATH=../gpgscm:$(PATH) \
+       TMP=$(TMP) \
+       srcdir=$(abs_srcdir) \
+       objdir=$(abs_top_builddir) \
+       GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm:$(abs_top_srcdir)/tests/openpgp
+
+XTESTS = \
+       version.scm \
+       enarmor.scm \
+       mds.scm \
+       decrypt.scm \
+       decrypt-multifile.scm \
+       decrypt-dsa.scm \
+       sigs.scm \
+       sigs-dsa.scm \
+       encrypt.scm \
+       encrypt-multifile.scm \
+       encrypt-dsa.scm \
+       compression.scm \
+       seat.scm \
+       clearsig.scm \
+       encryptp.scm \
+       detach.scm \
+       detachm.scm \
+       armsigs.scm \
+       armencrypt.scm \
+       armencryptp.scm \
+       signencrypt.scm \
+       signencrypt-dsa.scm \
+       armsignencrypt.scm \
+       armdetach.scm \
+       armdetachm.scm \
+       genkey1024.scm \
+       conventional.scm \
+       conventional-mdc.scm \
+       multisig.scm \
+       verify.scm \
+       verify-multifile.scm \
+       gpgv-forged-keyring.scm \
+       armor.scm \
+       import.scm \
+       import-revocation-certificate.scm \
+       ecc.scm \
+       4gb-packet.scm \
+       tofu.scm \
+       gpgtar.scm \
+       use-exact-key.scm \
+       default-key.scm \
+       export.scm \
+       ssh-import.scm \
+       ssh-export.scm \
+       quick-key-manipulation.scm \
+       key-selection.scm \
+       delete-keys.scm \
+       issue2015.scm \
+       issue2346.scm \
+       issue2417.scm \
+       issue2419.scm
+
+# XXX: Currently, one cannot override automake's 'check' target.  As a
+# workaround, we avoid defining 'TESTS', thus automake will not emit
+# the 'check' target.  For extra robustness, we merely define a
+# dependency on 'xcheck', so this hack should also work even if
+# automake would emit the 'check' target, as adding dependencies to
+# targets is okay.
+check: xcheck
+
+.PHONY: xcheck
+xcheck:
+       $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
+         run-tests.scm $(TESTFLAGS) $(XTESTS)
 
 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 \
@@ -68,8 +116,47 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
              gpg.conf.tmpl gpg-agent.conf.tmpl \
             bug537-test.data.asc bug894-test.asc \
             bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
-            tofu-keys.asc tofu-keys-secret.asc \
-            tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt
+            tofu/conflicting/1C005AF3.gpg \
+            tofu/conflicting/1C005AF3-secret.gpg \
+            tofu/conflicting/1C005AF3-1.txt \
+            tofu/conflicting/1C005AF3-2.txt \
+            tofu/conflicting/1C005AF3-3.txt \
+            tofu/conflicting/1C005AF3-4.txt \
+            tofu/conflicting/1C005AF3-5.txt \
+            tofu/conflicting/B662E42F.gpg \
+            tofu/conflicting/B662E42F-secret.gpg \
+            tofu/conflicting/B662E42F-1.txt \
+            tofu/conflicting/B662E42F-2.txt \
+            tofu/conflicting/B662E42F-3.txt \
+            tofu/conflicting/B662E42F-4.txt \
+            tofu/conflicting/B662E42F-5.txt \
+            tofu/conflicting/BE04EB2B.gpg \
+            tofu/conflicting/BE04EB2B-secret.gpg \
+            tofu/conflicting/BE04EB2B-1.txt \
+            tofu/conflicting/BE04EB2B-2.txt \
+            tofu/conflicting/BE04EB2B-3.txt \
+            tofu/conflicting/BE04EB2B-4.txt \
+            tofu/conflicting/BE04EB2B-5.txt \
+            tofu/cross-sigs/EC38277E-secret.gpg \
+            tofu/cross-sigs/EC38277E-1.gpg \
+            tofu/cross-sigs/EC38277E-1.txt \
+            tofu/cross-sigs/EC38277E-2.gpg \
+            tofu/cross-sigs/EC38277E-2.txt \
+            tofu/cross-sigs/EC38277E-3.txt \
+            tofu/cross-sigs/871C2247-secret.gpg \
+            tofu/cross-sigs/871C2247-1.gpg \
+            tofu/cross-sigs/871C2247-1.txt \
+            tofu/cross-sigs/871C2247-2.gpg \
+            tofu/cross-sigs/871C2247-2.txt \
+            tofu/cross-sigs/871C2247-3.gpg \
+            tofu/cross-sigs/871C2247-3.txt \
+            tofu/cross-sigs/871C2247-4.gpg \
+            tofu/cross-sigs/README \
+            key-selection/0.asc \
+            key-selection/1.asc \
+            key-selection/2.asc \
+            key-selection/3.asc \
+            key-selection/4.asc
 
 data_files = data-500 data-9000 data-32000 data-80000 plain-large
 
@@ -98,10 +185,14 @@ priv_keys = privkeys/50B2D4FA4122C212611048BC5FC31BD44393626E.asc \
            privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc \
            privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc \
            privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc \
-           privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc
-
-
-sample_keys = samplekeys/ecc-sample-1-pub.asc \
+           privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc \
+            privkeys/1E28F20E41B54C2D1234D896096495FF57E08D18.asc \
+            privkeys/EB33B687EB8581AB64D04852A54453E85F3DF62D.asc \
+           privkeys/C6A6390E9388CDBAD71EAEA698233FE5E04F001E.asc \
+           privkeys/D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3.asc
+
+sample_keys = samplekeys/README \
+              samplekeys/ecc-sample-1-pub.asc \
               samplekeys/ecc-sample-2-pub.asc \
               samplekeys/ecc-sample-3-pub.asc \
               samplekeys/ecc-sample-1-sec.asc \
@@ -114,18 +205,35 @@ sample_keys = samplekeys/ecc-sample-1-pub.asc \
              samplekeys/whats-new-in-2.1.asc \
              samplekeys/e2e-p256-1-clr.asc \
              samplekeys/e2e-p256-1-prt.asc \
-             samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc
-
-EXTRA_DIST = defs.inc pinentry.sh $(TESTS) $(TEST_FILES) ChangeLog-2011 \
-            mkdemodirs signdemokey $(priv_keys) $(sample_keys)
+             samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc \
+              samplekeys/rsa-rsa-sample-1.asc \
+              samplekeys/ed25519-cv25519-sample-1.asc \
+             samplekeys/silent-running.asc \
+             samplekeys/ssh-dsa.key \
+             samplekeys/ssh-ecdsa.key \
+             samplekeys/ssh-ed25519.key \
+             samplekeys/ssh-rsa.key \
+             samplekeys/issue2346.gpg \
+             samplekeys/authenticate-only.pub.asc \
+             samplekeys/authenticate-only.sec.asc
+
+sample_msgs = samplemsgs/issue2419.asc \
+             samplemsgs/clearsig-1-key-1.asc \
+             samplemsgs/signed-1-key-1.asc \
+             samplemsgs/revoke-2D727CC768697734.asc
+
+EXTRA_DIST = defs.scm $(XTESTS) $(TEST_FILES) \
+            mkdemodirs signdemokey $(priv_keys) $(sample_keys)   \
+            $(sample_msgs) ChangeLog-2011 run-tests.scm \
+            setup.scm shell.scm
 
 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 \
+            *.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \
             pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \
             secring.gpg pubring.pkr secring.skr \
             gnupg-test.stop random_seed gpg-agent.log tofu.db \
-            passphrases
+            passphrases sshcontrol S.gpg-agent.ssh
 
 clean-local:
        -rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d