diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-06-29 10:28:02 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-06-29 10:28:47 +0200 |
| commit | 3cc1f7ddce290e7b503884a28a68976bbfd952ea (patch) | |
| tree | a838dd24d84545f771cfdd27c2bf350cca504864 | |
| parent | 61f3ef61b0a996c1ef8903c1a4106160ea4315cc (diff) | |
| download | gnutls-3cc1f7ddce290e7b503884a28a68976bbfd952ea.tar.gz | |
tests: moved pkcs11 tests to main test suite
| -rw-r--r-- | tests/Makefile.am | 10 | ||||
| -rw-r--r-- | tests/pkcs11/pkcs11-chainverify.c (renamed from tests/suite/pkcs11-chainverify.c) | 0 | ||||
| -rw-r--r-- | tests/pkcs11/pkcs11-combo.c (renamed from tests/suite/pkcs11-combo.c) | 0 | ||||
| -rw-r--r-- | tests/pkcs11/pkcs11-get-issuer.c (renamed from tests/suite/pkcs11-get-issuer.c) | 0 | ||||
| -rw-r--r-- | tests/pkcs11/pkcs11-is-known.c (renamed from tests/suite/pkcs11-is-known.c) | 0 | ||||
| -rw-r--r-- | tests/pkcs11/softhsm.h (renamed from tests/suite/softhsm.h) | 0 | ||||
| -rw-r--r-- | tests/suite/Makefile.am | 3 |
7 files changed, 8 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 4bd03bfc76..967d48eae7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,7 +36,7 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h test-chains.h \ certs/cert-rsa-2432.pem certs/ecc384.pem certs/ecc.pem \ certs/ca-ecc.pem certs/cert-ecc384.pem certs/cert-ecc.pem certs/ecc256.pem \ certs/ecc521.pem certs/rsa-2432.pem x509cert-dir/ca.pem \ - cert-common.h + cert-common.h pkcs11/softhsm.h AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = \ @@ -106,7 +106,10 @@ pkcs11_get_exts_DEPENDENCIES = libpkcs11mock1.la libutils.la pkcs11_get_raw_issuer_exts_SOURCES = pkcs11/pkcs11-get-raw-issuer-exts.c pkcs11_get_raw_issuer_exts_DEPENDENCIES = libpkcs11mock1.la libutils.la -ctests += pkcs11-cert-import-url-exts pkcs11-get-exts pkcs11-get-raw-issuer-exts +ctests += pkcs11-cert-import-url-exts pkcs11-get-exts pkcs11-get-raw-issuer-exts \ + pkcs11/pkcs11-chainverify pkcs11/pkcs11-get-issuer pkcs11/pkcs11-is-known \ + pkcs11/pkcs11-combo + endif endif endif @@ -158,7 +161,8 @@ TESTS_ENVIRONMENT = \ X509CERTDIR=$(srcdir)/x509cert-dir/ \ EXEEXT=$(EXEEXT) \ top_builddir="$(top_builddir)" \ - srcdir="$(srcdir)" + srcdir="$(srcdir)" \ + OPENSSL_ia32cap=0x00000000 if WANT_TEST_SUITE LOG_COMPILER = $(VALGRIND) diff --git a/tests/suite/pkcs11-chainverify.c b/tests/pkcs11/pkcs11-chainverify.c index 741bf7494f..741bf7494f 100644 --- a/tests/suite/pkcs11-chainverify.c +++ b/tests/pkcs11/pkcs11-chainverify.c diff --git a/tests/suite/pkcs11-combo.c b/tests/pkcs11/pkcs11-combo.c index bdd4059223..bdd4059223 100644 --- a/tests/suite/pkcs11-combo.c +++ b/tests/pkcs11/pkcs11-combo.c diff --git a/tests/suite/pkcs11-get-issuer.c b/tests/pkcs11/pkcs11-get-issuer.c index 8f947a835b..8f947a835b 100644 --- a/tests/suite/pkcs11-get-issuer.c +++ b/tests/pkcs11/pkcs11-get-issuer.c diff --git a/tests/suite/pkcs11-is-known.c b/tests/pkcs11/pkcs11-is-known.c index eef9ff6400..eef9ff6400 100644 --- a/tests/suite/pkcs11-is-known.c +++ b/tests/pkcs11/pkcs11-is-known.c diff --git a/tests/suite/softhsm.h b/tests/pkcs11/softhsm.h index 3ac8167d74..3ac8167d74 100644 --- a/tests/suite/softhsm.h +++ b/tests/pkcs11/softhsm.h diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index 450b29e086..794a4bace2 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -93,8 +93,7 @@ TESTS = test-ciphersuite-names eagain testsrn testcompat chain invalid-cert \ testpkcs11 testrng test-ciphersuite-names if ENABLE_PKCS11 -check_PROGRAMS += pkcs11-chainverify pkcs11-get-issuer pkcs11-is-known pkcs11-combo -TESTS += pkcs11-chainverify pkcs11-get-issuer crl-test pkcs11-is-known pkcs11-combo +TESTS += crl-test endif TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ |