summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-10 18:14:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-12 23:39:13 +0000
commitee2d13c973cfe98af5fbeffdaadfb3cce4d6b275 (patch)
tree6a07f69c209ffe8f8f070907c3fe7f52191eb628
parentef783c15aaf0d6f74087287215685cf86b163298 (diff)
downloadpoky-ee2d13c973cfe98af5fbeffdaadfb3cce4d6b275.tar.gz
babeltrace2: Fix ptest execution in minimal images and add debug info
Tweak the ptest dependencies so they work correctly in minimal images. There appears to be some usage of find or xargs that doesn't work with busybox. Also improve the test runner so the test-suite.log is dumped upon error which makes debugging much easier. (From OE-Core rev: 6f52a0a9f0f26ac0039af3edd3df22e21bd8a4a7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-kernel/lttng/babeltrace2/run-ptest12
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb3
2 files changed, 13 insertions, 2 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest
index 72fe223436..71a9c81bfb 100755
--- a/meta/recipes-kernel/lttng/babeltrace2/run-ptest
+++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest
@@ -6,4 +6,14 @@
6# test plan to raise ERRORs; this is just noise. 6# test plan to raise ERRORs; this is just noise.
7makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" 7makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3"
8 8
9exec make -C tests -k -s $makeargs $target 2>/dev/null 9exec 2> error.log
10make -C tests -k -s $makeargs $target
11exitcode=$?
12if [ -e error.log ]; then
13 cat error.log
14fi
15if [ -e tests/test-suite.log ]; then
16 cat tests/test-suite.log
17fi
18
19exit $exitcode \ No newline at end of file
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
index b48f07ea0d..04c2a27904 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
@@ -29,7 +29,8 @@ FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so"
29 29
30ASNEEDED = "" 30ASNEEDED = ""
31 31
32RDEPENDS:${PN}-ptest += "bash gawk python3" 32# coreutils since we need full mktemp
33RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils"
33 34
34do_compile_ptest () { 35do_compile_ptest () {
35 make -C tests all 36 make -C tests all