[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8139/8267] nettle-ptest: fix a failing test



commit 500ce8d139d343f3b6c18147af4652438f153f8b
Author: Juro Bystricky <juro bystricky intel com>
Date:   Fri Oct 13 12:24:03 2017 -0700

    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: 511db7c256dbb3f8ba95eabd025d427384d4a1cb)
    
    Signed-off-by: Juro Bystricky <juro bystricky intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    (cherry picked from commit f12d493418417c8529a97c7a768e4af58ea5c91b)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../nettle/nettle-3.3/dlopen-test.patch            |   20 ++++++++++++++++++++
 meta/recipes-support/nettle/nettle_3.3.bb          |    4 ++++
 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 0000000..c4f0b7e
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch
@@ -0,0 +1,20 @@
+Replace relative path of libnettle.so with absolute path so the test
+program can find it.
+Relative paths are not suitable, as the folder strucure for ptest
+is different from the one expected by the nettle testsuite.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Juro Bystricky <juro bystricky intel com>
+
+--- a/testsuite/dlopen-test.c  2016-10-01 00:28:38.000000000 -0700
++++ b/testsuite/dlopen-test.c  2017-10-13 11:08:57.227572860 -0700
+@@ -9,7 +9,7 @@
+ main (int argc UNUSED, char **argv UNUSED)
+ {
+ #if HAVE_LIBDL
+-  void *handle = dlopen ("../libnettle.so", RTLD_NOW);
++  void *handle = dlopen ("/usr/lib/libnettle.so", RTLD_NOW);
+   int (*get_version)(void);
+   if (!handle)
+     {
diff --git a/meta/recipes-support/nettle/nettle_3.3.bb b/meta/recipes-support/nettle/nettle_3.3.bb
index b76babf..3951678 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 += "\
             file://check-header-files-of-openssl-only-if-enable_.patch \
             "
 
+SRC_URI_append_class-target = "\
+            file://dlopen-test.patch \
+            "
+
 SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe"
 SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]