summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2018-09-20 10:16:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 18:45:46 -0700
commit2d760d2d61583c259fac15e86a54b6085b5528ef (patch)
tree45f4de275b7544105ffa8428f985d7895df42c25 /meta
parentaa6def606fcb239fa8997764cdf4ebb1ec27802d (diff)
downloadpoky-2d760d2d61583c259fac15e86a54b6085b5528ef.tar.gz
dbus-test: fix ptest failed problem when multilib is enabled
Fix some failed info like: | ./test/test-bus: relocation error: ./test/test-bus: symbol | _dbus_threads_init_debug, version LIBDBUS_PRIVATE_1.10.10 not defined | in file libdbus-1.so.3 with link time reference | FAIL: test/test-bus In run-ptest, LD_LIBRARY_PATH is set to /usr/lib, but when multilib is enabled, /usr/lib64 will be used. fix by replace with correct path. (From OE-Core rev: d1bdf962dc3f121066bd7efb451dd9072b881718) Signed-off-by: Changqing Li <changqing.li@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-core/dbus/dbus-test_1.12.10.bb1
-rwxr-xr-xmeta/recipes-core/dbus/dbus/run-ptest2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.10.bb b/meta/recipes-core/dbus/dbus-test_1.12.10.bb
index e3ee608e3d..25b9395120 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.10.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.10.bb
@@ -75,6 +75,7 @@ do_install_ptest() {
75 sed -i \ 75 sed -i \
76 -e 's:${B}:${PTEST_PATH}:g' \ 76 -e 's:${B}:${PTEST_PATH}:g' \
77 {} + 77 {} +
78 sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest
78} 79}
79 80
80RDEPENDS_${PN}-ptest += "bash" 81RDEPENDS_${PN}-ptest += "bash"
diff --git a/meta/recipes-core/dbus/dbus/run-ptest b/meta/recipes-core/dbus/dbus/run-ptest
index 8a8970ee20..353ba1e905 100755
--- a/meta/recipes-core/dbus/dbus/run-ptest
+++ b/meta/recipes-core/dbus/dbus/run-ptest
@@ -12,7 +12,7 @@ output() {
12 12
13export DBUS_TEST_HOMEDIR=./test 13export DBUS_TEST_HOMEDIR=./test
14export XDG_RUNTIME_DIR=./test 14export XDG_RUNTIME_DIR=./test
15export LD_LIBRARY_PATH=/usr/lib/dbus-test/ptest/test/.libs 15export LD_LIBRARY_PATH=@PTEST_PATH@/test/.libs
16 16
17files=`ls test/test-*` 17files=`ls test/test-*`
18 18