diff options
author | Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> | 2019-03-12 21:13:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-18 11:12:25 +0000 |
commit | 1b9010a3d640a9bc9309b671418f5d8ae86f2a79 (patch) | |
tree | e1c76167ad5229dd43d7b68ed41b0f8706345bd5 /meta/recipes-kernel | |
parent | 361b637aabc3a8404138888346677761aba8a0ba (diff) | |
download | poky-1b9010a3d640a9bc9309b671418f5d8ae86f2a79.tar.gz |
lttng-tools ptest: add missing dependencies
Multiple tests are failing due to missing dependencies on a bare
core-image-minimal build with only lttng-tools ptest present.
"getconf LONG_BIT" is used to get the bitness of the host to run the
correct consumerd. Depend on glibc-utils.
perl-module-overloading is needed to validate trace. babelstats.pl
"head -c" is used to generate a random string. It is easier to depends
on coreutils to get a feature complete "head" than to enable to "fancy
head" feature of busybox. See utils.sh randstring.
"taskset" is used in a couple of scripts to ensure that events generated
finish in the same buffer. Depend on util-linux.
[RP: Tweak for glibc/musl handling]
(From OE-Core rev: a266788c0037173b41e5e7a4b39b38b80333b87b)
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb | 13 |
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 | ||
12 | DEPENDS = "liburcu popt libxml2 util-linux" | 12 | DEPENDS = "liburcu popt libxml2 util-linux" |
13 | RDEPENDS_${PN} = "libgcc" | 13 | RDEPENDS_${PN} = "libgcc" |
14 | RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps" | 14 | RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps perl-module-overloading coreutils util-linux" |
15 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" | ||
16 | RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" | ||
15 | # babelstats.pl wants getopt-long | 17 | # babelstats.pl wants getopt-long |
16 | RDEPENDS_${PN}-ptest += "perl-module-getopt-long" | 18 | RDEPENDS_${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}" |