From a8209b001cda393e472de1cdcffc354138890f36 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 31 May 2021 15:29:18 +0200 Subject: [PATCH] tests: Rename subdir gpgsm to cms and move sample dirs. -- It does not make sense to have the cms stuff at the top level but the openpgp at a dedicated directory. This patch fixes that. --- configure.ac | 4 +- tests/Makefile.am | 45 ++---------------- .../32100C27173EF6E9C4E9A25D3D69F86D37A4F939 | 0 .../567064FE6D14A17B2D811ABB407728BC558AA455 | 0 tests/{gpgsm => cms}/Makefile.am | 41 ++++++++++++++-- tests/{gpgsm => cms}/all-tests.scm | 10 ++-- tests/{ => cms}/cert_cci_sphinx_ca.pem | 0 tests/{ => cms}/cert_cci_test_wzs.pem | 0 tests/{ => cms}/cert_cci_test_zs.pem | 0 tests/{ => cms}/cert_cci_user02.pem | 0 tests/{ => cms}/cert_cci_user03.pem | 0 tests/{ => cms}/cert_cci_user04.pem | 0 tests/{ => cms}/cert_cci_user06.pem | 0 tests/{ => cms}/cert_cci_user07.pem | 0 tests/{gpgsm => cms}/cert_dfn_pca01.der | Bin tests/{gpgsm => cms}/cert_dfn_pca15.der | Bin tests/{gpgsm => cms}/cert_g10code_test1.der | Bin tests/{ => cms}/cert_testpki_testpca.pem | 0 tests/{ => cms}/crl_testpki_testpca.pem | 0 tests/{gpgsm => cms}/decrypt.scm | 4 +- tests/{gpgsm => cms}/encrypt.scm | 2 +- tests/{gpgsm => cms}/export.scm | 2 +- tests/{gpgsm => cms}/gpgsm-defs.scm | 5 +- tests/{gpgsm => cms}/import.scm | 4 +- tests/{ => cms}/inittests | 4 +- tests/{ => cms}/key_g10code_pete1.pem | 0 tests/{ => cms}/key_g10code_theo1.pem | 0 tests/{gpgsm => cms}/plain-1.cms.asc | 0 tests/{gpgsm => cms}/plain-2.cms.asc | 0 tests/{gpgsm => cms}/plain-3.cms.asc | 0 tests/{gpgsm => cms}/plain-large.cms.asc | 0 tests/{gpgsm => cms}/run-tests.scm | 12 ++--- tests/{ => cms}/runtest | 0 ...100C27173EF6E9C4E9A25D3D69F86D37A4F939.key | 0 ...A638998DFABAC510EA645CE34F9686B2EDF7EA.key | 0 ...6D17B4B94BBE8304926C016D2C5C7805EB6705.key | 0 tests/{ => cms}/samplekeys/README | 0 .../samplekeys/cert-with-117-akas.pem | 0 .../samplekeys/cert_g10code_enconly_1.pem | 0 .../samplekeys/cert_g10code_pete1.pem | 0 .../samplekeys/cert_g10code_test1.pem | 0 .../samplekeys/cert_g10code_test_ca.pem | 0 .../samplekeys/cert_g10code_theo1.pem | 0 tests/{ => cms}/samplekeys/cryptlib-key.p12 | Bin tests/{ => cms}/samplekeys/gte.pem | 0 tests/{ => cms}/samplekeys/opensc-test.p12 | Bin .../{ => cms}/samplekeys/ossl-rentec-user.pem | 0 tests/{ => cms}/samplekeys/ov-server.p12 | Bin tests/{ => cms}/samplekeys/ov-user.p12 | Bin .../steed-self-signing-nonthority.pem | 0 tests/{ => cms}/samplekeys/webdeca.der | Bin tests/{ => cms}/samplekeys/webderoot.der | Bin .../samplemsgs/webde-buenemann-signed.cms | Bin tests/{gpgsm => cms}/setup.scm | 2 +- tests/{gpgsm => cms}/shell.scm | 2 +- tests/{gpgsm => cms}/sign.scm | 2 +- tests/{ => cms}/skey_g10code_test1.pem | 0 tests/{ => cms}/sm-sign+verify | 0 tests/{ => cms}/sm-verify | 0 tests/{ => cms}/text-1.dsig.pem | 0 tests/{ => cms}/text-1.osig-bad.pem | 0 tests/{ => cms}/text-1.osig-badusage.pem | 0 tests/{ => cms}/text-1.osig.pem | 0 tests/{ => cms}/text-1.txt | 0 tests/{ => cms}/text-2.osig-bad.pem | 0 tests/{ => cms}/text-2.osig.pem | 0 tests/{ => cms}/text-2.txt | 0 tests/{ => cms}/text-3.txt | 0 tests/{gpgsm => cms}/verify.scm | 2 +- tests/run-tests.scm | 2 +- 70 files changed, 70 insertions(+), 73 deletions(-) rename tests/{gpgsm => cms}/32100C27173EF6E9C4E9A25D3D69F86D37A4F939 (100%) rename tests/{ => cms}/567064FE6D14A17B2D811ABB407728BC558AA455 (100%) rename tests/{gpgsm => cms}/Makefile.am (57%) rename tests/{gpgsm => cms}/all-tests.scm (83%) rename tests/{ => cms}/cert_cci_sphinx_ca.pem (100%) rename tests/{ => cms}/cert_cci_test_wzs.pem (100%) rename tests/{ => cms}/cert_cci_test_zs.pem (100%) rename tests/{ => cms}/cert_cci_user02.pem (100%) rename tests/{ => cms}/cert_cci_user03.pem (100%) rename tests/{ => cms}/cert_cci_user04.pem (100%) rename tests/{ => cms}/cert_cci_user06.pem (100%) rename tests/{ => cms}/cert_cci_user07.pem (100%) rename tests/{gpgsm => cms}/cert_dfn_pca01.der (100%) rename tests/{gpgsm => cms}/cert_dfn_pca15.der (100%) rename tests/{gpgsm => cms}/cert_g10code_test1.der (100%) rename tests/{ => cms}/cert_testpki_testpca.pem (100%) rename tests/{ => cms}/crl_testpki_testpca.pem (100%) rename tests/{gpgsm => cms}/decrypt.scm (87%) rename tests/{gpgsm => cms}/encrypt.scm (96%) rename tests/{gpgsm => cms}/export.scm (95%) rename tests/{gpgsm => cms}/gpgsm-defs.scm (94%) rename tests/{gpgsm => cms}/import.scm (92%) rename tests/{ => cms}/inittests (96%) rename tests/{ => cms}/key_g10code_pete1.pem (100%) rename tests/{ => cms}/key_g10code_theo1.pem (100%) rename tests/{gpgsm => cms}/plain-1.cms.asc (100%) rename tests/{gpgsm => cms}/plain-2.cms.asc (100%) rename tests/{gpgsm => cms}/plain-3.cms.asc (100%) rename tests/{gpgsm => cms}/plain-large.cms.asc (100%) rename tests/{gpgsm => cms}/run-tests.scm (82%) rename tests/{ => cms}/runtest (100%) rename tests/{ => cms}/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key (100%) rename tests/{ => cms}/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key (100%) rename tests/{ => cms}/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key (100%) rename tests/{ => cms}/samplekeys/README (100%) rename tests/{ => cms}/samplekeys/cert-with-117-akas.pem (100%) rename tests/{ => cms}/samplekeys/cert_g10code_enconly_1.pem (100%) rename tests/{ => cms}/samplekeys/cert_g10code_pete1.pem (100%) rename tests/{ => cms}/samplekeys/cert_g10code_test1.pem (100%) rename tests/{ => cms}/samplekeys/cert_g10code_test_ca.pem (100%) rename tests/{ => cms}/samplekeys/cert_g10code_theo1.pem (100%) rename tests/{ => cms}/samplekeys/cryptlib-key.p12 (100%) rename tests/{ => cms}/samplekeys/gte.pem (100%) rename tests/{ => cms}/samplekeys/opensc-test.p12 (100%) rename tests/{ => cms}/samplekeys/ossl-rentec-user.pem (100%) rename tests/{ => cms}/samplekeys/ov-server.p12 (100%) rename tests/{ => cms}/samplekeys/ov-user.p12 (100%) rename tests/{ => cms}/samplekeys/steed-self-signing-nonthority.pem (100%) rename tests/{ => cms}/samplekeys/webdeca.der (100%) rename tests/{ => cms}/samplekeys/webderoot.der (100%) rename tests/{ => cms}/samplemsgs/webde-buenemann-signed.cms (100%) rename tests/{gpgsm => cms}/setup.scm (95%) rename tests/{gpgsm => cms}/shell.scm (94%) rename tests/{gpgsm => cms}/sign.scm (95%) rename tests/{ => cms}/skey_g10code_test1.pem (100%) rename tests/{ => cms}/sm-sign+verify (100%) rename tests/{ => cms}/sm-verify (100%) rename tests/{ => cms}/text-1.dsig.pem (100%) rename tests/{ => cms}/text-1.osig-bad.pem (100%) rename tests/{ => cms}/text-1.osig-badusage.pem (100%) rename tests/{ => cms}/text-1.osig.pem (100%) rename tests/{ => cms}/text-1.txt (100%) rename tests/{ => cms}/text-2.osig-bad.pem (100%) rename tests/{ => cms}/text-2.osig.pem (100%) rename tests/{ => cms}/text-2.txt (100%) rename tests/{ => cms}/text-3.txt (100%) rename tests/{gpgsm => cms}/verify.scm (97%) diff --git a/configure.ac b/configure.ac index 6d128837e..7b398f3df 100644 --- a/configure.ac +++ b/configure.ac @@ -2144,9 +2144,9 @@ doc/Makefile tests/Makefile tests/gpgscm/Makefile tests/openpgp/Makefile -tests/tpm2dtests/Makefile +tests/cms/Makefile tests/migrations/Makefile -tests/gpgsm/Makefile +tests/tpm2dtests/Makefile tests/gpgme/Makefile tests/pkits/Makefile g10/gpg.w32-manifest diff --git a/tests/Makefile.am b/tests/Makefile.am index 624334c63..f29b68a53 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,60 +24,23 @@ else tpm2dtests = endif -SUBDIRS = gpgscm openpgp migrations gpgsm gpgme pkits $(tpm2dtests) . +SUBDIRS = gpgscm openpgp cms migrations gpgme pkits $(tpm2dtests) . GPGSM = ../sm/gpgsm -# Note that we need to use /bin/pwd so that we don't get into trouble -# if the shell used for inittests would uses an internal version of -# pwd which handles symlinks differently. -TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \ - GPGSM="$(GPGSM)" "$(srcdir)/runtest" -testscripts = sm-sign+verify sm-verify - -EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \ - text-1.txt text-2.txt text-3.txt \ - text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \ - text-2.osig.pem text-2.osig-bad.pem \ +EXTRA_DIST = run-tests.scm \ fake-pinentries/README.txt \ fake-pinentries/fake-pinentry.php \ fake-pinentries/fake-pinentry.pl \ fake-pinentries/fake-pinentry.py \ fake-pinentries/fake-pinentry.sh \ - samplekeys/steed-self-signing-nonthority.pem \ - samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \ - samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \ - samplekeys/cert_g10code_pete1.pem \ - samplekeys/cert_g10code_test1.pem \ - samplekeys/cert_g10code_theo1.pem \ - run-tests.scm + ChangeLog-2011 -# We used to run $(testscripts) here but these asschk scripts are not -# completely reliable in all environments and thus we better disable -# them. The tests are anyway way too minimal. We will eventually -# write new tests based on gpg-connect-agent which has a full fledged -# script language and thus makes it far easier to write tests than to -# use that low-level asschk stuff. -TESTS = - -CLEANFILES = inittests.stamp x y y z out err \ - *.lock .\#lk* - -DISTCLEANFILES = pubring.kbx~ random_seed +CLEANFILES = x y z out err if !HAVE_W32_SYSTEM noinst_PROGRAMS = asschk endif asschk_SOURCES = asschk.c - - -all-local: inittests.stamp - -clean-local: - srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests --clean - -inittests.stamp: inittests - srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests - echo timestamp >./inittests.stamp diff --git a/tests/gpgsm/32100C27173EF6E9C4E9A25D3D69F86D37A4F939 b/tests/cms/32100C27173EF6E9C4E9A25D3D69F86D37A4F939 similarity index 100% rename from tests/gpgsm/32100C27173EF6E9C4E9A25D3D69F86D37A4F939 rename to tests/cms/32100C27173EF6E9C4E9A25D3D69F86D37A4F939 diff --git a/tests/567064FE6D14A17B2D811ABB407728BC558AA455 b/tests/cms/567064FE6D14A17B2D811ABB407728BC558AA455 similarity index 100% rename from tests/567064FE6D14A17B2D811ABB407728BC558AA455 rename to tests/cms/567064FE6D14A17B2D811ABB407728BC558AA455 diff --git a/tests/gpgsm/Makefile.am b/tests/cms/Makefile.am similarity index 57% rename from tests/gpgsm/Makefile.am rename to tests/cms/Makefile.am index e784a3168..03c7d8d21 100644 --- a/tests/gpgsm/Makefile.am +++ b/tests/cms/Makefile.am @@ -28,6 +28,12 @@ include $(top_srcdir)/am/cmacros.am AM_CFLAGS = +# Note that we need to use /bin/pwd so that we don't get into trouble +# if the shell used for inittests would uses an internal version of +# pwd which handles symlinks differently. +OLD_TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \ + GPGSM="$(GPGSM)" "$(srcdir)/runtest" + TESTS_ENVIRONMENT = LC_ALL=C \ EXEEXT=$(EXEEXT) \ PATH="../gpgscm:$(PATH)" \ @@ -65,11 +71,38 @@ TEST_FILES = plain-1.cms.asc \ plain-3.cms.asc \ plain-large.cms.asc -EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \ - gpgsm-defs.scm run-tests.scm setup.scm all-tests.scm +# We used to run $(testscripts) here but these asschk scripts are not +# completely reliable in all environments and thus we better disable +# them. The tests are anyway way too minimal. We will eventually +# write new tests based on gpg-connect-agent which has a full fledged +# script language and thus makes it far easier to write tests than to +# use that low-level asschk stuff. +testscripts = sm-sign+verify sm-verify -CLEANFILES = *.log report.xml +EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \ + samplekeys/steed-self-signing-nonthority.pem \ + samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \ + samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \ + samplekeys/cert_g10code_pete1.pem \ + samplekeys/cert_g10code_test1.pem \ + samplekeys/cert_g10code_theo1.pem \ + text-1.txt text-2.txt text-3.txt \ + text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \ + text-2.osig.pem text-2.osig-bad.pem \ + runtest inittests $(testscripts) \ + gpgsm-defs.scm run-tests.scm setup.scm all-tests.scm + +CLEANFILES = inittests.stamp *.lock *.log report.xml .\#lk* + +DISTCLEANFILES = pubring.kbx~ 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) +all-local: $(required_pgms) inittests.stamp + +clean-local: + srcdir=$(srcdir) $(OLD_TESTS_ENVIRONMENT) $(srcdir)/inittests --clean + +inittests.stamp: inittests + srcdir=$(srcdir) $(OLD_TESTS_ENVIRONMENT) $(srcdir)/inittests + echo timestamp >./inittests.stamp diff --git a/tests/gpgsm/all-tests.scm b/tests/cms/all-tests.scm similarity index 83% rename from tests/gpgsm/all-tests.scm rename to tests/cms/all-tests.scm index 1baa92468..78ad00678 100644 --- a/tests/gpgsm/all-tests.scm +++ b/tests/cms/all-tests.scm @@ -30,14 +30,14 @@ (make-environment-cache (test::scm #f - (path-join "tests" "gpgsm" "setup.scm") - (in-srcdir "tests" "gpgsm" "setup.scm") + (path-join "tests" "cms" "setup.scm") + (in-srcdir "tests" "cms" "setup.scm") "--" "tests" "gpg"))) (map (lambda (name) (test::scm setup - (path-join "tests" "gpgsm" name) - (in-srcdir "tests" "gpgsm" name))) - (parse-makefile-expand (in-srcdir "tests" "gpgsm" "Makefile.am") + (path-join "tests" "cms" name) + (in-srcdir "tests" "cms" name))) + (parse-makefile-expand (in-srcdir "tests" "cms" "Makefile.am") (lambda (filename port key) (parse-makefile port key)) "XTESTS"))) diff --git a/tests/cert_cci_sphinx_ca.pem b/tests/cms/cert_cci_sphinx_ca.pem similarity index 100% rename from tests/cert_cci_sphinx_ca.pem rename to tests/cms/cert_cci_sphinx_ca.pem diff --git a/tests/cert_cci_test_wzs.pem b/tests/cms/cert_cci_test_wzs.pem similarity index 100% rename from tests/cert_cci_test_wzs.pem rename to tests/cms/cert_cci_test_wzs.pem diff --git a/tests/cert_cci_test_zs.pem b/tests/cms/cert_cci_test_zs.pem similarity index 100% rename from tests/cert_cci_test_zs.pem rename to tests/cms/cert_cci_test_zs.pem diff --git a/tests/cert_cci_user02.pem b/tests/cms/cert_cci_user02.pem similarity index 100% rename from tests/cert_cci_user02.pem rename to tests/cms/cert_cci_user02.pem diff --git a/tests/cert_cci_user03.pem b/tests/cms/cert_cci_user03.pem similarity index 100% rename from tests/cert_cci_user03.pem rename to tests/cms/cert_cci_user03.pem diff --git a/tests/cert_cci_user04.pem b/tests/cms/cert_cci_user04.pem similarity index 100% rename from tests/cert_cci_user04.pem rename to tests/cms/cert_cci_user04.pem diff --git a/tests/cert_cci_user06.pem b/tests/cms/cert_cci_user06.pem similarity index 100% rename from tests/cert_cci_user06.pem rename to tests/cms/cert_cci_user06.pem diff --git a/tests/cert_cci_user07.pem b/tests/cms/cert_cci_user07.pem similarity index 100% rename from tests/cert_cci_user07.pem rename to tests/cms/cert_cci_user07.pem diff --git a/tests/gpgsm/cert_dfn_pca01.der b/tests/cms/cert_dfn_pca01.der similarity index 100% rename from tests/gpgsm/cert_dfn_pca01.der rename to tests/cms/cert_dfn_pca01.der diff --git a/tests/gpgsm/cert_dfn_pca15.der b/tests/cms/cert_dfn_pca15.der similarity index 100% rename from tests/gpgsm/cert_dfn_pca15.der rename to tests/cms/cert_dfn_pca15.der diff --git a/tests/gpgsm/cert_g10code_test1.der b/tests/cms/cert_g10code_test1.der similarity index 100% rename from tests/gpgsm/cert_g10code_test1.der rename to tests/cms/cert_g10code_test1.der diff --git a/tests/cert_testpki_testpca.pem b/tests/cms/cert_testpki_testpca.pem similarity index 100% rename from tests/cert_testpki_testpca.pem rename to tests/cms/cert_testpki_testpca.pem diff --git a/tests/crl_testpki_testpca.pem b/tests/cms/crl_testpki_testpca.pem similarity index 100% rename from tests/crl_testpki_testpca.pem rename to tests/cms/crl_testpki_testpca.pem diff --git a/tests/gpgsm/decrypt.scm b/tests/cms/decrypt.scm similarity index 87% rename from tests/gpgsm/decrypt.scm rename to tests/cms/decrypt.scm index c328ba89d..16bded668 100644 --- a/tests/gpgsm/decrypt.scm +++ b/tests/cms/decrypt.scm @@ -17,14 +17,14 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see . -(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm")) +(load (in-srcdir "tests" "cms" "gpgsm-defs.scm")) (setup-gpgsm-environment) (for-each-p "Checking decryption of supplied files." (lambda (name) (tr:do - (tr:open (in-srcdir "tests" "gpgsm" (string-append name ".cms.asc"))) + (tr:open (in-srcdir "tests" "cms" (string-append name ".cms.asc"))) (tr:gpgsm "" '(--decrypt)) (tr:assert-identity name))) plain-files) diff --git a/tests/gpgsm/encrypt.scm b/tests/cms/encrypt.scm similarity index 96% rename from tests/gpgsm/encrypt.scm rename to tests/cms/encrypt.scm index bb90c8e73..5e679d923 100644 --- a/tests/gpgsm/encrypt.scm +++ b/tests/cms/encrypt.scm @@ -17,7 +17,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see . -(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm")) +(load (in-srcdir "tests" "cms" "gpgsm-defs.scm")) (setup-gpgsm-environment) (for-each-p diff --git a/tests/gpgsm/export.scm b/tests/cms/export.scm similarity index 95% rename from tests/gpgsm/export.scm rename to tests/cms/export.scm index 4a8108bd3..1100f2464 100644 --- a/tests/gpgsm/export.scm +++ b/tests/cms/export.scm @@ -17,7 +17,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see . -(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm")) +(load (in-srcdir "tests" "cms" "gpgsm-defs.scm")) (setup-gpgsm-environment) (for-each-p' diff --git a/tests/gpgsm/gpgsm-defs.scm b/tests/cms/gpgsm-defs.scm similarity index 94% rename from tests/gpgsm/gpgsm-defs.scm rename to tests/cms/gpgsm-defs.scm index 848bc7581..f643afaad 100644 --- a/tests/gpgsm/gpgsm-defs.scm +++ b/tests/cms/gpgsm-defs.scm @@ -78,13 +78,14 @@ (log "Storing private keys") (for-each (lambda (name) - (file-copy (in-srcdir "tests" "gpgsm" name) + (file-copy (in-srcdir "tests" "cms" name) (path-join "private-keys-v1.d" (string-append name ".key")))) '("32100C27173EF6E9C4E9A25D3D69F86D37A4F939")) (log "Importing public demo and test keys") - (call-check `(,@gpgsm --import ,(in-srcdir "tests" "gpgsm" "cert_g10code_test1.der"))) + (call-check `(,@gpgsm --import ,(in-srcdir "tests" "cms" + "cert_g10code_test1.der"))) (create-sample-files) (stop-agent)) diff --git a/tests/gpgsm/import.scm b/tests/cms/import.scm similarity index 92% rename from tests/gpgsm/import.scm rename to tests/cms/import.scm index be555da8a..4c85ae4bb 100644 --- a/tests/gpgsm/import.scm +++ b/tests/cms/import.scm @@ -17,7 +17,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see . -(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm")) +(load (in-srcdir "tests" "cms" "gpgsm-defs.scm")) (setup-gpgsm-environment) (define certs-for-import @@ -47,7 +47,7 @@ "Checking certificate import." (lambda (test) (assert (not (sm-have-public-key? (:cert test)))) - (call-check `(,@gpgsm --import ,(in-srcdir "tests" "gpgsm" (:name test)))) + (call-check `(,@gpgsm --import ,(in-srcdir "tests" "cms" (:name test)))) (assert (sm-have-public-key? (:cert test)))) (lambda (test) (:name test)) certs-for-import) diff --git a/tests/inittests b/tests/cms/inittests similarity index 96% rename from tests/inittests rename to tests/cms/inittests index 9090674e3..296bf1426 100755 --- a/tests/inittests +++ b/tests/cms/inittests @@ -28,10 +28,10 @@ msg msg.sig msg.unsig [ -z "$srcdir" ] && srcdir=. -[ -z "$GPGSM" ] && GPGSM=../sm/gpgsm +[ -z "$GPGSM" ] && GPGSM=../../sm/gpgsm if [ -d $srcdir/samplekeys ] \ - && grep TESTS_ENVIRONMENT Makefile >/dev/null 2>&1; then + && grep OLD_TESTS_ENVIRONMENT Makefile >/dev/null 2>&1; then : else # During make distclean the Makefile has already been removed, diff --git a/tests/key_g10code_pete1.pem b/tests/cms/key_g10code_pete1.pem similarity index 100% rename from tests/key_g10code_pete1.pem rename to tests/cms/key_g10code_pete1.pem diff --git a/tests/key_g10code_theo1.pem b/tests/cms/key_g10code_theo1.pem similarity index 100% rename from tests/key_g10code_theo1.pem rename to tests/cms/key_g10code_theo1.pem diff --git a/tests/gpgsm/plain-1.cms.asc b/tests/cms/plain-1.cms.asc similarity index 100% rename from tests/gpgsm/plain-1.cms.asc rename to tests/cms/plain-1.cms.asc diff --git a/tests/gpgsm/plain-2.cms.asc b/tests/cms/plain-2.cms.asc similarity index 100% rename from tests/gpgsm/plain-2.cms.asc rename to tests/cms/plain-2.cms.asc diff --git a/tests/gpgsm/plain-3.cms.asc b/tests/cms/plain-3.cms.asc similarity index 100% rename from tests/gpgsm/plain-3.cms.asc rename to tests/cms/plain-3.cms.asc diff --git a/tests/gpgsm/plain-large.cms.asc b/tests/cms/plain-large.cms.asc similarity index 100% rename from tests/gpgsm/plain-large.cms.asc rename to tests/cms/plain-large.cms.asc diff --git a/tests/gpgsm/run-tests.scm b/tests/cms/run-tests.scm similarity index 82% rename from tests/gpgsm/run-tests.scm rename to tests/cms/run-tests.scm index 6b460b165..caae86d5b 100644 --- a/tests/gpgsm/run-tests.scm +++ b/tests/cms/run-tests.scm @@ -20,7 +20,7 @@ (if (string=? "" (getenv "abs_top_srcdir")) (begin (echo "Environment variable 'abs_top_srcdir' not set. Please point it to" - "tests/gpgsm.") + "tests/cms.") (exit 2))) (define tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*)) @@ -28,12 +28,12 @@ (define setup (make-environment-cache (test::scm #f - (path-join "tests" "gpgsm" "setup.scm") - (in-srcdir "tests" "gpgsm" "setup.scm")))) + (path-join "tests" "cms" "setup.scm") + (in-srcdir "tests" "cms" "setup.scm")))) (run-tests (if (null? tests) - (load-tests "tests" "gpgsm") + (load-tests "tests" "cms") (map (lambda (name) (test::scm setup - (path-join "tests" "gpgsm" name) - (in-srcdir "tests" "gpgsm" name))) tests))) + (path-join "tests" "cms" name) + (in-srcdir "tests" "cms" name))) tests))) diff --git a/tests/runtest b/tests/cms/runtest similarity index 100% rename from tests/runtest rename to tests/cms/runtest diff --git a/tests/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key b/tests/cms/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key similarity index 100% rename from tests/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key rename to tests/cms/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key diff --git a/tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key b/tests/cms/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key similarity index 100% rename from tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key rename to tests/cms/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key diff --git a/tests/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key b/tests/cms/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key similarity index 100% rename from tests/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key rename to tests/cms/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key diff --git a/tests/samplekeys/README b/tests/cms/samplekeys/README similarity index 100% rename from tests/samplekeys/README rename to tests/cms/samplekeys/README diff --git a/tests/samplekeys/cert-with-117-akas.pem b/tests/cms/samplekeys/cert-with-117-akas.pem similarity index 100% rename from tests/samplekeys/cert-with-117-akas.pem rename to tests/cms/samplekeys/cert-with-117-akas.pem diff --git a/tests/samplekeys/cert_g10code_enconly_1.pem b/tests/cms/samplekeys/cert_g10code_enconly_1.pem similarity index 100% rename from tests/samplekeys/cert_g10code_enconly_1.pem rename to tests/cms/samplekeys/cert_g10code_enconly_1.pem diff --git a/tests/samplekeys/cert_g10code_pete1.pem b/tests/cms/samplekeys/cert_g10code_pete1.pem similarity index 100% rename from tests/samplekeys/cert_g10code_pete1.pem rename to tests/cms/samplekeys/cert_g10code_pete1.pem diff --git a/tests/samplekeys/cert_g10code_test1.pem b/tests/cms/samplekeys/cert_g10code_test1.pem similarity index 100% rename from tests/samplekeys/cert_g10code_test1.pem rename to tests/cms/samplekeys/cert_g10code_test1.pem diff --git a/tests/samplekeys/cert_g10code_test_ca.pem b/tests/cms/samplekeys/cert_g10code_test_ca.pem similarity index 100% rename from tests/samplekeys/cert_g10code_test_ca.pem rename to tests/cms/samplekeys/cert_g10code_test_ca.pem diff --git a/tests/samplekeys/cert_g10code_theo1.pem b/tests/cms/samplekeys/cert_g10code_theo1.pem similarity index 100% rename from tests/samplekeys/cert_g10code_theo1.pem rename to tests/cms/samplekeys/cert_g10code_theo1.pem diff --git a/tests/samplekeys/cryptlib-key.p12 b/tests/cms/samplekeys/cryptlib-key.p12 similarity index 100% rename from tests/samplekeys/cryptlib-key.p12 rename to tests/cms/samplekeys/cryptlib-key.p12 diff --git a/tests/samplekeys/gte.pem b/tests/cms/samplekeys/gte.pem similarity index 100% rename from tests/samplekeys/gte.pem rename to tests/cms/samplekeys/gte.pem diff --git a/tests/samplekeys/opensc-test.p12 b/tests/cms/samplekeys/opensc-test.p12 similarity index 100% rename from tests/samplekeys/opensc-test.p12 rename to tests/cms/samplekeys/opensc-test.p12 diff --git a/tests/samplekeys/ossl-rentec-user.pem b/tests/cms/samplekeys/ossl-rentec-user.pem similarity index 100% rename from tests/samplekeys/ossl-rentec-user.pem rename to tests/cms/samplekeys/ossl-rentec-user.pem diff --git a/tests/samplekeys/ov-server.p12 b/tests/cms/samplekeys/ov-server.p12 similarity index 100% rename from tests/samplekeys/ov-server.p12 rename to tests/cms/samplekeys/ov-server.p12 diff --git a/tests/samplekeys/ov-user.p12 b/tests/cms/samplekeys/ov-user.p12 similarity index 100% rename from tests/samplekeys/ov-user.p12 rename to tests/cms/samplekeys/ov-user.p12 diff --git a/tests/samplekeys/steed-self-signing-nonthority.pem b/tests/cms/samplekeys/steed-self-signing-nonthority.pem similarity index 100% rename from tests/samplekeys/steed-self-signing-nonthority.pem rename to tests/cms/samplekeys/steed-self-signing-nonthority.pem diff --git a/tests/samplekeys/webdeca.der b/tests/cms/samplekeys/webdeca.der similarity index 100% rename from tests/samplekeys/webdeca.der rename to tests/cms/samplekeys/webdeca.der diff --git a/tests/samplekeys/webderoot.der b/tests/cms/samplekeys/webderoot.der similarity index 100% rename from tests/samplekeys/webderoot.der rename to tests/cms/samplekeys/webderoot.der diff --git a/tests/samplemsgs/webde-buenemann-signed.cms b/tests/cms/samplemsgs/webde-buenemann-signed.cms similarity index 100% rename from tests/samplemsgs/webde-buenemann-signed.cms rename to tests/cms/samplemsgs/webde-buenemann-signed.cms diff --git a/tests/gpgsm/setup.scm b/tests/cms/setup.scm similarity index 95% rename from tests/gpgsm/setup.scm rename to tests/cms/setup.scm index c241b38fe..577b26f47 100644 --- a/tests/gpgsm/setup.scm +++ b/tests/cms/setup.scm @@ -17,7 +17,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see . -(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm")) +(load (in-srcdir "tests" "cms" "gpgsm-defs.scm")) (define tarball (flag "--create-tarball" *args*)) (unless (and tarball (not (null? tarball))) diff --git a/tests/gpgsm/shell.scm b/tests/cms/shell.scm similarity index 94% rename from tests/gpgsm/shell.scm rename to tests/cms/shell.scm index 606e3880b..ca4171cc9 100644 --- a/tests/gpgsm/shell.scm +++ b/tests/cms/shell.scm @@ -17,7 +17,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see . -(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm")) +(load (in-srcdir "tests" "cms" "gpgsm-defs.scm")) (setup-gpgsm-environment) ;; This is not a test, but can be used to inspect the test diff --git a/tests/gpgsm/sign.scm b/tests/cms/sign.scm similarity index 95% rename from tests/gpgsm/sign.scm rename to tests/cms/sign.scm index 48b7b0669..0c118524a 100644 --- a/tests/gpgsm/sign.scm +++ b/tests/cms/sign.scm @@ -17,7 +17,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see . -(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm")) +(load (in-srcdir "tests" "cms" "gpgsm-defs.scm")) (setup-gpgsm-environment) (for-each-p diff --git a/tests/skey_g10code_test1.pem b/tests/cms/skey_g10code_test1.pem similarity index 100% rename from tests/skey_g10code_test1.pem rename to tests/cms/skey_g10code_test1.pem diff --git a/tests/sm-sign+verify b/tests/cms/sm-sign+verify similarity index 100% rename from tests/sm-sign+verify rename to tests/cms/sm-sign+verify diff --git a/tests/sm-verify b/tests/cms/sm-verify similarity index 100% rename from tests/sm-verify rename to tests/cms/sm-verify diff --git a/tests/text-1.dsig.pem b/tests/cms/text-1.dsig.pem similarity index 100% rename from tests/text-1.dsig.pem rename to tests/cms/text-1.dsig.pem diff --git a/tests/text-1.osig-bad.pem b/tests/cms/text-1.osig-bad.pem similarity index 100% rename from tests/text-1.osig-bad.pem rename to tests/cms/text-1.osig-bad.pem diff --git a/tests/text-1.osig-badusage.pem b/tests/cms/text-1.osig-badusage.pem similarity index 100% rename from tests/text-1.osig-badusage.pem rename to tests/cms/text-1.osig-badusage.pem diff --git a/tests/text-1.osig.pem b/tests/cms/text-1.osig.pem similarity index 100% rename from tests/text-1.osig.pem rename to tests/cms/text-1.osig.pem diff --git a/tests/text-1.txt b/tests/cms/text-1.txt similarity index 100% rename from tests/text-1.txt rename to tests/cms/text-1.txt diff --git a/tests/text-2.osig-bad.pem b/tests/cms/text-2.osig-bad.pem similarity index 100% rename from tests/text-2.osig-bad.pem rename to tests/cms/text-2.osig-bad.pem diff --git a/tests/text-2.osig.pem b/tests/cms/text-2.osig.pem similarity index 100% rename from tests/text-2.osig.pem rename to tests/cms/text-2.osig.pem diff --git a/tests/text-2.txt b/tests/cms/text-2.txt similarity index 100% rename from tests/text-2.txt rename to tests/cms/text-2.txt diff --git a/tests/text-3.txt b/tests/cms/text-3.txt similarity index 100% rename from tests/text-3.txt rename to tests/cms/text-3.txt diff --git a/tests/gpgsm/verify.scm b/tests/cms/verify.scm similarity index 97% rename from tests/gpgsm/verify.scm rename to tests/cms/verify.scm index 40dbd4898..531a8f16f 100644 --- a/tests/gpgsm/verify.scm +++ b/tests/cms/verify.scm @@ -17,7 +17,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see . -(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm")) +(load (in-srcdir "tests" "cms" "gpgsm-defs.scm")) (setup-gpgsm-environment) ;; diff --git a/tests/run-tests.scm b/tests/run-tests.scm index d3ebba07e..bb9ade50c 100644 --- a/tests/run-tests.scm +++ b/tests/run-tests.scm @@ -34,8 +34,8 @@ (load-tests-with-log "g13") (load-tests-with-log "agent") (load-tests-with-log "tests" "openpgp") + (load-tests-with-log "tests" "cms") (load-tests-with-log "tests" "migrations") - (load-tests-with-log "tests" "gpgsm") (load-tests-with-log "tests" "gpgme")))) (run-tests (if prefix (filter