summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-06-09 16:37:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-10 17:11:55 +0100
commit23d8d2b62892fb523e942c7ca4dbdcae414b6998 (patch)
tree16748013b6a10b3aa2c75c41e8df5020028cff87
parent3255d58577234b130768d6d57619cc76b6afcc6a (diff)
downloadpoky-23d8d2b62892fb523e942c7ca4dbdcae414b6998.tar.gz
openssl: fix ptests
Add some missing dependencies and fix the Makefile in order to get most of the ptest tests working (specifically test_bn, test_verify, test_cms, test_srp and test_heartbeat). test_verify still fails for unknown reasons (perhaps some of the now expired certificates weren't meant to have expired as far as the test is concerned?) but at least it has the certificates to run now. (From OE-Core rev: c679ec81c19dd2b5e366b713801785ce0ba5b49a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc3
-rw-r--r--meta/recipes-connectivity/openssl/openssl/ptest-deps.patch30
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1h.bb1
3 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 6c86588c83..b839c00dde 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -47,7 +47,7 @@ FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
47FILES_openssl-conf = "${libdir}/ssl/openssl.cnf" 47FILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
48CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf" 48CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
49RRECOMMENDS_libcrypto += "openssl-conf" 49RRECOMMENDS_libcrypto += "openssl-conf"
50RDEPENDS_${PN}-ptest += "${PN}-misc make" 50RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc"
51 51
52do_configure_prepend_darwin () { 52do_configure_prepend_darwin () {
53 sed -i -e '/version-script=openssl\.ld/d' Configure 53 sed -i -e '/version-script=openssl\.ld/d' Configure
@@ -176,6 +176,7 @@ do_install () {
176 176
177do_install_ptest () { 177do_install_ptest () {
178 cp -r Makefile test ${D}${PTEST_PATH} 178 cp -r Makefile test ${D}${PTEST_PATH}
179 cp -r certs ${D}${PTEST_PATH}
179 mkdir -p ${D}${PTEST_PATH}/apps 180 mkdir -p ${D}${PTEST_PATH}/apps
180 ln -sf /usr/lib/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps 181 ln -sf /usr/lib/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps
181 ln -sf /usr/lib/ssl/openssl.cnf ${D}${PTEST_PATH}/apps 182 ln -sf /usr/lib/ssl/openssl.cnf ${D}${PTEST_PATH}/apps
diff --git a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
new file mode 100644
index 0000000000..527e10c53b
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
@@ -0,0 +1,30 @@
1Remove Makefile dependencies for test targets
2
3These are probably here because the executables aren't always built for
4other platforms (e.g. Windows); however we can safely assume they'll
5always be there. None of the other test targets have such dependencies
6and if we don't remove them, make tries to rebuild the executables and
7fails during run-ptest.
8
9Upstream-Status: Inappropriate [config]
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12
13diff --git a/test/Makefile b/test/Makefile
14index e6fcfb4..5ae043b 100644
15--- a/test/Makefile
16+++ b/test/Makefile
17@@ -322,11 +322,11 @@ test_cms:
18 @echo "CMS consistency test"
19 $(PERL) cms-test.pl
20
21-test_srp: $(SRPTEST)$(EXE_EXT)
22+test_srp:
23 @echo "Test SRP"
24 ../util/shlib_wrap.sh ./srptest
25
26-test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT)
27+test_heartbeat:
28 ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
29
30 lint:
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb
index ebb1029ef4..ddaaba8836 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb
@@ -35,6 +35,7 @@ SRC_URI += "file://configure-targets.patch \
35 file://openssl-fix-des.pod-error.patch \ 35 file://openssl-fix-des.pod-error.patch \
36 file://Makefiles-ptest.patch \ 36 file://Makefiles-ptest.patch \
37 file://heartbeat-test-private-api.patch \ 37 file://heartbeat-test-private-api.patch \
38 file://ptest-deps.patch \
38 file://run-ptest \ 39 file://run-ptest \
39 " 40 "
40 41