diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-10 18:14:17 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-12 23:36:44 +0000 |
| commit | 6f52a0a9f0f26ac0039af3edd3df22e21bd8a4a7 (patch) | |
| tree | 2282119fdb203cefdc6f2f1ba5ef3aa8f1ef6193 | |
| parent | 9c35001345d107ec3869216a214439818099c1de (diff) | |
| download | openembedded-core-6f52a0a9f0f26ac0039af3edd3df22e21bd8a4a7.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | meta/recipes-kernel/lttng/babeltrace2/run-ptest | 12 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb | 3 |
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 @@ # test plan to raise ERRORs; this is just noise. makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" -exec make -C tests -k -s $makeargs $target 2>/dev/null +exec 2> error.log +make -C tests -k -s $makeargs $target +exitcode=$? +if [ -e error.log ]; then + cat error.log +fi +if [ -e tests/test-suite.log ]; then + cat tests/test-suite.log +fi + +exit $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" ASNEEDED = "" -RDEPENDS:${PN}-ptest += "bash gawk python3" +# coreutils since we need full mktemp +RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" do_compile_ptest () { make -C tests all |