Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20826468 enable internal tests for OpenSSL in the Userland gate
authorIvo Raisr <ivo.raisr@oracle.com>
Fri, 03 Apr 2015 05:12:37 -0700
changeset 4075 ce48c131af0c
parent 4074 3b59c13ef5ec
child 4076 2e5e1c2da629
20826468 enable internal tests for OpenSSL in the Userland gate
components/openssl/openssl-1.0.1-fips-140/Makefile file | annotate | diff | comparison | revisions
components/openssl/openssl-1.0.1-fips-140/patches/39_test.patch file | annotate | diff | comparison | revisions
components/openssl/openssl-1.0.1/Makefile file | annotate | diff | comparison | revisions
components/openssl/openssl-1.0.1/patches/39_test.patch file | annotate | diff | comparison | revisions 
--- a/components/openssl/openssl-1.0.1-fips-140/Makefile	Wed Apr 08 18:26:34 2015 -0700
+++ b/components/openssl/openssl-1.0.1-fips-140/Makefile	Fri Apr 03 05:12:37 2015 -0700
@@ -194,7 +194,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 += developer/build/makedepend
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openssl/openssl-1.0.1-fips-140/patches/39_test.patch	Fri Apr 03 05:12:37 2015 -0700
@@ -0,0 +1,15 @@
+#
+# 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	Wed Apr 08 18:26:34 2015 -0700
+++ b/components/openssl/openssl-1.0.1/Makefile	Fri Apr 03 05:12:37 2015 -0700
@@ -400,7 +400,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 += developer/build/makedepend
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openssl/openssl-1.0.1/patches/39_test.patch	Fri Apr 03 05:12:37 2015 -0700
@@ -0,0 +1,15 @@
+#
+# 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:
upstream/oracle/userland-gate