[oe-commits] Chong Lu : lttng-tools: Fixes incorrect path of ptest cases
git at git.openembedded.org
git at git.openembedded.org
Wed Nov 20 11:09:38 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 95a0eb99b9fd88288b6f03c7d0173c392d25de28
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=95a0eb99b9fd88288b6f03c7d0173c392d25de28
Author: Chong Lu <Chong.Lu at windriver.com>
Date: Mon Nov 18 13:41:14 2013 +0800
lttng-tools: Fixes incorrect path of ptest cases
In ptest cases, some paths are still the source code path.
Continue to fix the paths of executable files in ptest cases
to make them work on target.
Signed-off-by: Chong Lu <Chong.Lu at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb
index f2a43b4..49c0992 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb
@@ -38,17 +38,22 @@ INSANE_SKIP_${PN}-dbg = "libexec"
do_install_ptest () {
chmod +x ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh
for i in `find ${D}/${libdir}/${PN}/ptest -perm /u+x -type f`; do
- sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:" \
- -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:" \
- -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:" \
- -e "s:\$TESTDIR/../src/bin/lttng-consumerd/:${libedir}/lttng/libexec/:" \
- -e "s:\$DIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:" \
- -e "s:\$TESTDIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:" \
+ sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \
+ -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \
+ -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \
+ -e "s:\$TESTDIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \
+ -e "s:\$DIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \
+ -e "s:\$TESTDIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \
+ -e "s:\$DIR/../src/bin/lttng-sessiond/lttng-sessiond:\$SESSIOND_BIN:g" \
+ -e "s:\$DIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \
+ -e "s:\$DIR/../bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \
-i $i
done
- sed -e "s:src/bin/lttng-sessiond:$bindir:" \
- -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:" \
+ sed -e "s:src/bin/lttng-sessiond:$bindir:g" \
+ -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \
-i ${D}/${libdir}/${PN}/ptest/tests/regression/run-report.py
+ sed -e "s:src/bin:bin:g" \
+ -i ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh
}
More information about the Openembedded-commits
mailing list