20826468 enable internal tests for OpenSSL in the Userland gate s11-update
authorIvo Raisr <ivo.raisr@oracle.com>
Thu, 07 May 2015 07:12:25 -0700
branchs11-update
changeset 4284 2396bbbdaf71
parent 4283 d5f4044aa6b7
child 4290 6be89e713896
20826468 enable internal tests for OpenSSL in the Userland gate
components/openssl/openssl-1.0.1-fips-140/Makefile
components/openssl/openssl-1.0.1-fips-140/patches/39_test.patch
components/openssl/openssl-1.0.1/Makefile
components/openssl/openssl-1.0.1/patches/39_internal_tests.patch
--- a/components/openssl/openssl-1.0.1-fips-140/Makefile	Thu May 07 07:13:02 2015 -0700
+++ b/components/openssl/openssl-1.0.1-fips-140/Makefile	Thu May 07 07:12:25 2015 -0700
@@ -189,7 +189,10 @@
 $(BUILD_DIR_64)/llib-lcrypto.ln: LINT_FLAGS=$(LFLAGS_64)
 $(BUILD_DIR_64)/llib-lssl.ln: LINT_FLAGS=$(LFLAGS_64)
 
-test:		$(NO_TESTS)
+# There are also separate STC test suites 'openssl' and 'openssl-engine'
+# for regression testing. These internal tests are unit tests only.
+COMPONENT_TEST_TARGETS = test
+test:		$(TEST_32_and_64)
 
 
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openssl/openssl-1.0.1-fips-140/patches/39_test.patch	Thu May 07 07:12:25 2015 -0700
@@ -0,0 +1,17 @@
+#
+# Patch developed in-house. Solaris-specific; not suitable for upstream.
+#
+# Remove test 'test_ca' because it depends on directories
+# not present in the build directory. The rest of tests are ok.
+#
+--- a/test/Makefile.orig	Thu Apr  2 12:11:12 2015
++++ b/test/Makefile	Thu Apr  2 12:11:21 2015
+@@ -142,7 +142,7 @@
+ 	test_rand test_bn test_ec test_ecdsa test_ecdh \
+ 	test_enc test_x509 test_rsa test_crl test_sid \
+ 	test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
+-	test_ss test_ca test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
++	test_ss test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
+ 	test_jpake test_srp test_cms test_heartbeat test_constant_time
+ 
+ test_evp:
--- a/components/openssl/openssl-1.0.1/Makefile	Thu May 07 07:13:02 2015 -0700
+++ b/components/openssl/openssl-1.0.1/Makefile	Thu May 07 07:12:25 2015 -0700
@@ -393,7 +393,10 @@
 $(BUILD_DIR_64)/llib-lcrypto.ln: LINT_FLAGS=$(LFLAGS_64)
 $(BUILD_DIR_64)/llib-lssl.ln: LINT_FLAGS=$(LFLAGS_64)
 
-test:		$(NO_TESTS)
+# There are also separate STC test suites 'openssl' and 'openssl-engine'
+# for regression testing. These internal tests are unit tests only.
+COMPONENT_TEST_TARGETS = test
+test:		$(TEST_32_and_64)
 
 
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openssl/openssl-1.0.1/patches/39_internal_tests.patch	Thu May 07 07:12:25 2015 -0700
@@ -0,0 +1,17 @@
+#
+# Patch developed in-house. Solaris-specific; not suitable for upstream.
+#
+# Remove test 'test_ca' because it depends on directories
+# not present in the build directory. The rest of tests are ok.
+#
+--- a/test/Makefile.orig	Thu Apr  2 12:11:12 2015
++++ b/test/Makefile	Thu Apr  2 12:11:21 2015
+@@ -142,7 +142,7 @@
+ 	test_rand test_bn test_ec test_ecdsa test_ecdh \
+ 	test_enc test_x509 test_rsa test_crl test_sid \
+ 	test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
+-	test_ss test_ca test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
++	test_ss test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
+ 	test_jpake test_srp test_cms test_heartbeat test_constant_time
+ 
+ test_evp: