tests: moved pkcs11-softhsm test suite into pkcs11/

11 files changed, 9 insertions, 6 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 61d2dea25b..cc0f2f8053 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-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 psk.passwd \
-	system.prio
+	system.prio pkcs11/softhsm.h pkcs11/pkcs11-pubkey-import.c
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
@@ -151,7 +151,10 @@ 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 \
-	 pkcs11-cert-import-url4-exts
+	pkcs11-cert-import-url4-exts pkcs11/pkcs11-chainverify pkcs11/pkcs11-get-issuer pkcs11/pkcs11-is-known \
+	pkcs11/pkcs11-combo pkcs11/pkcs11-privkey pkcs11/pkcs11-pubkey-import-rsa pkcs11/pkcs11-pubkey-import-ecdsa
+
+
 endif
 endif
 
@@ -248,8 +251,9 @@ TESTS_ENVIRONMENT =						\
 	X509CERTDIR=$(srcdir)/x509cert-dir/			\
 	GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/system.prio	\
 	PSK_FILE=$(srcdir)/psk.passwd				\
+	OPENSSL_ia32cap=0x00000000				\
 	EXEEXT=$(EXEEXT)					\
-	builddir="$(builddir)"				\
+	builddir="$(builddir)"					\
 	top_builddir="$(top_builddir)"				\
 	srcdir="$(srcdir)"
 
diff --git a/tests/suite/pkcs11-chainverify.c b/tests/pkcs11/pkcs11-chainverify.c
index ac2148b219..ac2148b219 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 f2effbd388..f2effbd388 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 fd65f3d82b..fd65f3d82b 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 99e946aab7..99e946aab7 100644
--- a/tests/suite/pkcs11-is-known.c
+++ b/tests/pkcs11/pkcs11-is-known.c
diff --git a/tests/suite/pkcs11-privkey.c b/tests/pkcs11/pkcs11-privkey.c
index 714614d997..714614d997 100644
--- a/tests/suite/pkcs11-privkey.c
+++ b/tests/pkcs11/pkcs11-privkey.c
diff --git a/tests/suite/pkcs11-pubkey-import-ecdsa.c b/tests/pkcs11/pkcs11-pubkey-import-ecdsa.c
index 38465c7885..38465c7885 100644
--- a/tests/suite/pkcs11-pubkey-import-ecdsa.c
+++ b/tests/pkcs11/pkcs11-pubkey-import-ecdsa.c
diff --git a/tests/suite/pkcs11-pubkey-import-rsa.c b/tests/pkcs11/pkcs11-pubkey-import-rsa.c
index ad0596f3f3..ad0596f3f3 100644
--- a/tests/suite/pkcs11-pubkey-import-rsa.c
+++ b/tests/pkcs11/pkcs11-pubkey-import-rsa.c
diff --git a/tests/suite/pkcs11-pubkey-import.c b/tests/pkcs11/pkcs11-pubkey-import.c
index c286652b20..c286652b20 100644
--- a/tests/suite/pkcs11-pubkey-import.c
+++ b/tests/pkcs11/pkcs11-pubkey-import.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 f1f97db96f..f4093a8570 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -84,14 +84,13 @@ nodist_libecore_la_SOURCES = ecore/src/lib/ecore_anim.c			\
 
 
 EXTRA_DIST += testcompat-main-polarssl testcompat-main-openssl testcompat-common \
-	testpkcs11.pkcs15 testpkcs11.softhsm testpkcs11.sc-hsm softhsm.h
+	testpkcs11.pkcs15 testpkcs11.softhsm testpkcs11.sc-hsm
 nodist_check_SCRIPTS = testsrn.sh chain.sh invalid-cert.sh \
 	testpkcs11.sh testrng.sh testcompat-polarssl.sh testcompat-openssl.sh \
 	testrandom.sh
 
 if ENABLE_PKCS11
-check_PROGRAMS += pkcs11-chainverify pkcs11-get-issuer pkcs11-is-known pkcs11-combo pkcs11-privkey pkcs11-pubkey-import-rsa pkcs11-pubkey-import-ecdsa
-nodist_check_SCRIPTS += testpkcs11.sh pkcs11-chainverify pkcs11-get-issuer crl-test pkcs11-is-known pkcs11-combo pkcs11-privkey pkcs11-pubkey-import-ecdsa pkcs11-pubkey-import-rsa
+nodist_check_SCRIPTS += testpkcs11.sh pkcs11-chainverify pkcs11-get-issuer crl-test
 endif
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \