mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
lttng-tools ptest: fix test_ust-dl
(From OE-Core rev: 935a91aa269c0a1eb1778f72726e4ce32ff077fe) Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
1b9010a3d6
commit
3e7789eae9
@@ -89,6 +89,9 @@ do_install_ptest () {
|
||||
install -d "${D}${PTEST_PATH}/tests/$d"
|
||||
find "${B}/tests/$d" -maxdepth 1 -executable -type f \
|
||||
-exec install -t "${D}${PTEST_PATH}/tests/$d" {} +
|
||||
# Take all .py scripts for tests using the python bindings.
|
||||
find "${B}/tests/$d" -maxdepth 1 -type f -name "*.py" \
|
||||
-exec install -t "${D}${PTEST_PATH}/tests/$d" {} +
|
||||
test -r "${B}/tests/$d/Makefile" && \
|
||||
install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"
|
||||
done
|
||||
@@ -100,11 +103,21 @@ do_install_ptest () {
|
||||
*.so)
|
||||
install -d ${D}${PTEST_PATH}/tests/$d/
|
||||
ln -s ../$f ${D}${PTEST_PATH}/tests/$d/$f
|
||||
# Remove any rpath/runpath to pass QA check.
|
||||
chrpath --delete ${D}${PTEST_PATH}/tests/$d/$f
|
||||
;;
|
||||
esac
|
||||
done
|
||||
done
|
||||
|
||||
#
|
||||
# Use the versioned libs of liblttng-ust-dl.
|
||||
#
|
||||
ustdl="${D}${PTEST_PATH}/tests/regression/ust/ust-dl/test_ust-dl.py"
|
||||
if [ -e $ustdl ]; then
|
||||
sed -i -e 's!:liblttng-ust-dl.so!:liblttng-ust-dl.so.0!' $ustdl
|
||||
fi
|
||||
|
||||
install ${B}/tests/unit/ini_config/sample.ini ${D}${PTEST_PATH}/tests/unit/ini_config/
|
||||
|
||||
# We shouldn't need to build anything in tests/regression/tools
|
||||
@@ -121,16 +134,6 @@ do_install_ptest () {
|
||||
-e 's/^all-am:.*/all-am:/' \
|
||||
{} +
|
||||
|
||||
# These objects trigger [rpaths] QA checks; the test harness
|
||||
# skips the associated tests if they're missing, so delete
|
||||
# them.
|
||||
objs=""
|
||||
objs="$objs regression/ust/ust-dl/libbar.so"
|
||||
objs="$objs regression/ust/ust-dl/libfoo.so"
|
||||
for obj in $objs ; do
|
||||
rm -f "${D}${PTEST_PATH}/tests/${obj}"
|
||||
done
|
||||
|
||||
find "${D}${PTEST_PATH}" -name Makefile -type f -exec \
|
||||
touch -r "${B}/Makefile" {} +
|
||||
|
||||
|
||||
Reference in New Issue
Block a user