[PATCH 0/1] lttng-tools: fix ptest execution failure

[PATCH 0/1] lttng-tools: fix ptest execution failure

[Chong Lu]

The following changes since commit c16795477ea7e2159b5d3808268912b572887e2d:

  qemu: add PACKAGECONFIG for numa (2014-08-27 12:13:38 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib chonglu/lttng
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/lttng

Chong Lu (1):
  lttng-tools: fix ptest execution failure

 meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

-- 
1.9.1

[PATCH 1/1] lttng-tools: fix ptest execution failure

[Chong Lu]

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.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb | 13 +++++++------
 1 file 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 14e5f9e..00d0cbc 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 () {
 }
 
 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
+	chmod +x ${D}${PTEST_PATH}/tests/utils/utils.sh
+	for i in `find ${D}${PTEST_PATH} -perm /u+x -type f`; do
 		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" \
@@ -56,8 +56,9 @@ do_install_ptest () {
 
 	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
-
+	-i ${D}${PTEST_PATH}/tests/regression/run-report.py
+	sed -e "s:src/bin:bin:g" -e "s:lt-::g" \
+	-i ${D}${PTEST_PATH}/tests/utils/utils.sh
+	sed -e "s:ini_config:\.libs\/ini_config:" \
+	-i ${D}${PTEST_PATH}/tests/unit/ini_config/test_ini_config
 }
-- 
1.9.1