summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb13
1 files changed, 3 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 9d21fb00bf..8c711eb79c 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
11 11
12DEPENDS = "liburcu popt libxml2 util-linux" 12DEPENDS = "liburcu popt libxml2 util-linux"
13RDEPENDS_${PN} = "libgcc" 13RDEPENDS_${PN} = "libgcc"
14RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps" 14RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps perl-module-overloading coreutils util-linux"
15RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
16RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
15# babelstats.pl wants getopt-long 17# babelstats.pl wants getopt-long
16RDEPENDS_${PN}-ptest += "perl-module-getopt-long" 18RDEPENDS_${PN}-ptest += "perl-module-getopt-long"
17 19
@@ -141,15 +143,6 @@ do_install_ptest () {
141 -e 's#\(^test.*LDADD.=\)#disable\1#g' \ 143 -e 's#\(^test.*LDADD.=\)#disable\1#g' \
142 -i ${D}${PTEST_PATH}/tests/unit/Makefile 144 -i ${D}${PTEST_PATH}/tests/unit/Makefile
143 145
144 #
145 # Disable notification tools tests as currently
146 # these hang and cause the rest of the ptests to timeout
147 #
148 sed -e 's#tools/notification/test_notification_ust##g' \
149 -e 's#tools/notification/test_notification_kernel##g' \
150 -e 's#tools/notification/test_notification_multi_app##g' \
151 -i ${D}${PTEST_PATH}/tests/regression/Makefile
152
153 # Substitute links to installed binaries. 146 # Substitute links to installed binaries.
154 for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd lttng-crash; do 147 for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd lttng-crash; do
155 exedir="${D}${PTEST_PATH}/src/bin/${prog}" 148 exedir="${D}${PTEST_PATH}/src/bin/${prog}"