From d1bdf962dc3f121066bd7efb451dd9072b881718 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 20 Sep 2018 10:16:27 +0800 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-core/dbus/dbus-test_1.12.10.bb | 1 + meta/recipes-core/dbus/dbus/run-ptest | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core') 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-*` -- cgit v1.2.3