summaryrefslogtreecommitdiffstats
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-20 12:24:04 -0700
commitd1bdf962dc3f121066bd7efb451dd9072b881718 (patch)
tree539db44678b59f2a2c11c03c9830e570a1ee3386
parentf9b7de219ae03b48843f65a49d90822b33d34534 (diff)
downloadopenembedded-core-contrib-d1bdf962dc3f121066bd7efb451dd9072b881718.tar.gz
openembedded-core-contrib-d1bdf962dc3f121066bd7efb451dd9072b881718.tar.bz2
openembedded-core-contrib-d1bdf962dc3f121066bd7efb451dd9072b881718.zip
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. Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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() {
sed -i \
-e 's:${B}:${PTEST_PATH}:g' \
{} +
+ sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest
}
RDEPENDS_${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() {
export DBUS_TEST_HOMEDIR=./test
export XDG_RUNTIME_DIR=./test
-export LD_LIBRARY_PATH=/usr/lib/dbus-test/ptest/test/.libs
+export LD_LIBRARY_PATH=@PTEST_PATH@/test/.libs
files=`ls test/test-*`