diff options
| author |   Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> | 2019-03-12 21:13:30 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-18 11:08:59 +0000 |
| commit | 935a91aa269c0a1eb1778f72726e4ce32ff077fe (patch) | |
| tree | b661158aa5a3cd86ee7a606776ee7640279d35c8 /meta | |
| parent | a266788c0037173b41e5e7a4b39b38b80333b87b (diff) | |
| download | openembedded-core-935a91aa269c0a1eb1778f72726e4ce32ff077fe.tar.gz | |
lttng-tools ptest: fix test_ust-dl
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb index 8c711eb79c..151e35e3c3 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb @@ -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" {} + |