summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-08-28 17:39:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-29 23:44:36 +0100
commit39f77bb6aaf4fab6eff2b32470800e183d2b7eaf (patch)
tree8bd81984c257b2cb44e7ae3b74821b713add5d7b
parentfe2e53ba30ba679c038bd5b48b9a91a41af4c49e (diff)
downloadpoky-39f77bb6aaf4fab6eff2b32470800e183d2b7eaf.tar.gz
lttng-tools: fix ptest execution failure
Ptest will hang when execute "./run.sh fast_regression" and lttng background daemon can't be killed normally. This patch fixes this issue and use ${PTEST_PATH} instead of long path. (From OE-Core rev: 0a90616b09290e4651aafe1186229d861392e89f) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb
index 560a2437ee..1ec0f4a72b 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb
@@ -40,8 +40,8 @@ do_configure_prepend () {
40} 40}
41 41
42do_install_ptest () { 42do_install_ptest () {
43 chmod +x ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh 43 chmod +x ${D}${PTEST_PATH}/tests/utils/utils.sh
44 for i in `find ${D}/${libdir}/${PN}/ptest -perm /u+x -type f`; do 44 for i in `find ${D}${PTEST_PATH} -perm /u+x -type f`; do
45 sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \ 45 sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \
46 -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ 46 -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \
47 -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ 47 -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \
@@ -56,8 +56,9 @@ do_install_ptest () {
56 56
57 sed -e "s:src/bin/lttng-sessiond:$bindir:g" \ 57 sed -e "s:src/bin/lttng-sessiond:$bindir:g" \
58 -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \ 58 -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \
59 -i ${D}/${libdir}/${PN}/ptest/tests/regression/run-report.py 59 -i ${D}${PTEST_PATH}/tests/regression/run-report.py
60 sed -e "s:src/bin:bin:g" \ 60 sed -e "s:src/bin:bin:g" -e "s:lt-::g" \
61 -i ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh 61 -i ${D}${PTEST_PATH}/tests/utils/utils.sh
62 62 sed -e "s:ini_config:\.libs\/ini_config:" \
63 -i ${D}${PTEST_PATH}/tests/unit/ini_config/test_ini_config
63} 64}