summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-10-13 12:24:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:33:22 +0000
commit452e524ac7519e0686e9704fc9d117e23cb40da6 (patch)
tree0d4db2bca355ad27f599d1cf6fe44f5fa6e4a149 /meta
parent08d50dcc25238e05685c122cd39b220f71d3ec52 (diff)
downloadpoky-452e524ac7519e0686e9704fc9d117e23cb40da6.tar.gz
nettle-ptest: fix a failing test
This patch changes the result of the nettle dlopen-test from FAIL to PASS. The test used to fail because the test could not find and load libnettle.so. This patch fixes this by using absolute path instead of relative. This was the only test out of 88 that used to fail. (From OE-Core rev: f12d493418417c8529a97c7a768e4af58ea5c91b) Signed-off-by: Juro Bystricky <juro.bystricky@intel.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-support/nettle/nettle-3.3/dlopen-test.patch20
-rw-r--r--meta/recipes-support/nettle/nettle_3.3.bb4
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch b/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch
new file mode 100644
index 0000000000..c4f0b7ea1c
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch
@@ -0,0 +1,20 @@
1Replace relative path of libnettle.so with absolute path so the test
2program can find it.
3Relative paths are not suitable, as the folder strucure for ptest
4is different from the one expected by the nettle testsuite.
5
6Upstream-Status: Inappropriate [embedded specific]
7
8Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
9
10--- a/testsuite/dlopen-test.c 2016-10-01 00:28:38.000000000 -0700
11+++ b/testsuite/dlopen-test.c 2017-10-13 11:08:57.227572860 -0700
12@@ -9,7 +9,7 @@
13 main (int argc UNUSED, char **argv UNUSED)
14 {
15 #if HAVE_LIBDL
16- void *handle = dlopen ("../libnettle.so", RTLD_NOW);
17+ void *handle = dlopen ("/usr/lib/libnettle.so", RTLD_NOW);
18 int (*get_version)(void);
19 if (!handle)
20 {
diff --git a/meta/recipes-support/nettle/nettle_3.3.bb b/meta/recipes-support/nettle/nettle_3.3.bb
index b76babfe2d..39516781bc 100644
--- a/meta/recipes-support/nettle/nettle_3.3.bb
+++ b/meta/recipes-support/nettle/nettle_3.3.bb
@@ -11,5 +11,9 @@ SRC_URI += "\
11 file://check-header-files-of-openssl-only-if-enable_.patch \ 11 file://check-header-files-of-openssl-only-if-enable_.patch \
12 " 12 "
13 13
14SRC_URI_append_class-target = "\
15 file://dlopen-test.patch \
16 "
17
14SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe" 18SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe"
15SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e" 19SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e"