summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Rajotte <jonathan.rajotte-julien@efficios.com>2019-03-12 21:13:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-18 11:12:25 +0000
commit3e7789eae96bf207bfc0a750eaab5f163a4a033e (patch)
tree7a6530948b1ee27b7ed814b40ba2d4acbce49e4c
parent1b9010a3d640a9bc9309b671418f5d8ae86f2a79 (diff)
downloadpoky-3e7789eae96bf207bfc0a750eaab5f163a4a033e.tar.gz
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>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb23
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 () {
89 install -d "${D}${PTEST_PATH}/tests/$d" 89 install -d "${D}${PTEST_PATH}/tests/$d"
90 find "${B}/tests/$d" -maxdepth 1 -executable -type f \ 90 find "${B}/tests/$d" -maxdepth 1 -executable -type f \
91 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + 91 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} +
92 # Take all .py scripts for tests using the python bindings.
93 find "${B}/tests/$d" -maxdepth 1 -type f -name "*.py" \
94 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} +
92 test -r "${B}/tests/$d/Makefile" && \ 95 test -r "${B}/tests/$d/Makefile" && \
93 install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" 96 install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"
94 done 97 done
@@ -100,11 +103,21 @@ do_install_ptest () {
100 *.so) 103 *.so)
101 install -d ${D}${PTEST_PATH}/tests/$d/ 104 install -d ${D}${PTEST_PATH}/tests/$d/
102 ln -s ../$f ${D}${PTEST_PATH}/tests/$d/$f 105 ln -s ../$f ${D}${PTEST_PATH}/tests/$d/$f
106 # Remove any rpath/runpath to pass QA check.
107 chrpath --delete ${D}${PTEST_PATH}/tests/$d/$f
103 ;; 108 ;;
104 esac 109 esac
105 done 110 done
106 done 111 done
107 112
113 #
114 # Use the versioned libs of liblttng-ust-dl.
115 #
116 ustdl="${D}${PTEST_PATH}/tests/regression/ust/ust-dl/test_ust-dl.py"
117 if [ -e $ustdl ]; then
118 sed -i -e 's!:liblttng-ust-dl.so!:liblttng-ust-dl.so.0!' $ustdl
119 fi
120
108 install ${B}/tests/unit/ini_config/sample.ini ${D}${PTEST_PATH}/tests/unit/ini_config/ 121 install ${B}/tests/unit/ini_config/sample.ini ${D}${PTEST_PATH}/tests/unit/ini_config/
109 122
110 # We shouldn't need to build anything in tests/regression/tools 123 # We shouldn't need to build anything in tests/regression/tools
@@ -121,16 +134,6 @@ do_install_ptest () {
121 -e 's/^all-am:.*/all-am:/' \ 134 -e 's/^all-am:.*/all-am:/' \
122 {} + 135 {} +
123 136
124 # These objects trigger [rpaths] QA checks; the test harness
125 # skips the associated tests if they're missing, so delete
126 # them.
127 objs=""
128 objs="$objs regression/ust/ust-dl/libbar.so"
129 objs="$objs regression/ust/ust-dl/libfoo.so"
130 for obj in $objs ; do
131 rm -f "${D}${PTEST_PATH}/tests/${obj}"
132 done
133
134 find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ 137 find "${D}${PTEST_PATH}" -name Makefile -type f -exec \
135 touch -r "${B}/Makefile" {} + 138 touch -r "${B}/Makefile" {} +
136 139