diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-10-03 00:58:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-04 14:21:41 +0100 |
commit | 89ea0638df93db35fdab3200c1c9d1e50ffdf5cf (patch) | |
tree | 8698c932801bda1e1965cb74d3222055c0bae84c /meta | |
parent | eafcef938b7891f8b8df2751a7598a03f4406b69 (diff) | |
download | poky-89ea0638df93db35fdab3200c1c9d1e50ffdf5cf.tar.gz |
openssl: skip ptest case `test_symbol_presence'
The case in ptest use `nm -Pg libcrypto.so' to check symbol presence,
if library is stripped or debug split, the case will fail.
The test case needs debug symbols then we just disable that test.
(From OE-Core rev: 28d3a4cb1ffb508018faebf088eabfd14bcf3113)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch | 46 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch b/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch new file mode 100644 index 0000000000..d8d9651b64 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From a9401b2289656c5a36dd1b0ecebf0d23e291ce70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 2 Oct 2018 23:58:24 +0800 | ||
4 | Subject: [PATCH] skip test_symbol_presence | ||
5 | |||
6 | We cannot skip `01-test_symbol_presence.t' by configuring option `no-shared' | ||
7 | as INSTALL told us the shared libraries will not be built. | ||
8 | |||
9 | [INSTALL snip] | ||
10 | Notes on shared libraries | ||
11 | ------------------------- | ||
12 | |||
13 | For most systems the OpenSSL Configure script knows what is needed to | ||
14 | build shared libraries for libcrypto and libssl. On these systems | ||
15 | the shared libraries will be created by default. This can be suppressed and | ||
16 | only static libraries created by using the "no-shared" option. On systems | ||
17 | where OpenSSL does not know how to build shared libraries the "no-shared" | ||
18 | option will be forced and only static libraries will be created. | ||
19 | [INSTALL snip] | ||
20 | |||
21 | Hence directly modification the case to skip it. | ||
22 | |||
23 | Upstream-Status: Inappropriate [OE Specific] | ||
24 | |||
25 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
26 | --- | ||
27 | test/recipes/01-test_symbol_presence.t | 3 +-- | ||
28 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
29 | |||
30 | diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t | ||
31 | index 7f2a2d7..0b93745 100644 | ||
32 | --- a/test/recipes/01-test_symbol_presence.t | ||
33 | +++ b/test/recipes/01-test_symbol_presence.t | ||
34 | @@ -14,8 +14,7 @@ use OpenSSL::Test::Utils; | ||
35 | |||
36 | setup("test_symbol_presence"); | ||
37 | |||
38 | -plan skip_all => "Only useful when building shared libraries" | ||
39 | - if disabled("shared"); | ||
40 | +plan skip_all => "The case needs debug symbols then we just disable it"; | ||
41 | |||
42 | my @libnames = ("crypto", "ssl"); | ||
43 | my $testcount = scalar @libnames; | ||
44 | -- | ||
45 | 2.7.4 | ||
46 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb index 73bcb27160..5a43a150f0 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb | |||
@@ -13,6 +13,7 @@ DEPENDS = "hostperl-runtime-native" | |||
13 | SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | 13 | SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ |
14 | file://run-ptest \ | 14 | file://run-ptest \ |
15 | file://openssl-c_rehash.sh \ | 15 | file://openssl-c_rehash.sh \ |
16 | file://0001-skip-test_symbol_presence.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRC_URI_append_class-nativesdk = " \ | 19 | SRC_URI_append_class-nativesdk = " \ |