From 9e9875fc19df6b924aa7f9d06e7b4e07222d0799 Mon Sep 17 00:00:00 2001 From: Nathan Lynch Date: Tue, 27 Sep 2016 14:04:46 -0500 Subject: lttng-tools: fix ptest Since the upgrade to 2.8, lttng-tools' test harness silently succeeds but doesn't actually run the tests. This is because upstream made some changes in their test harness: https://github.com/lttng/lttng-tools/commit/83666813cad3142ceccb929ca9b44d0e9cf53bc8 Updates to address this include: - drop now-irrelevant patch - change the ptest-run make target - remove indiscriminate search/replace commands from do_install_ptest - copy entire build directory into PTEST_PATH and then remove unneeded files - use lttng binaries installed on the system for the tests - add lttng-tools-ptest runtime dependencies - lttng-tools itself - babeltrace, used by the test harness to process traces - perl modules required by babelstats.pl test script - procps (for pgrep, pidof) - gawk - remove unnecessary chmod and munging of utils.sh script library - remove checkpatch from ptest installation tree - avoid path-munging of libtool artifacts altogether - use more efficient find+sed patterns to munge Makefiles - reduce test harness output to conform to ptest rules On qemux86-64 and qemuarm I get relatively stable results, with PASS/FAIL varying by +-1 on successive runs. TOTAL: 2345 PASS: 1735 SKIP: 311 XFAIL: 0 FAIL: 292 XPASS: 0 ERROR: 7 There are some ERRORs worth looking into further but this should be a useful basis for future work. Signed-off-by: Nathan Lynch Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/lttng-tools/run-ptest | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel/lttng/lttng-tools/run-ptest') diff --git a/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/meta/recipes-kernel/lttng/lttng-tools/run-ptest index e758815c77..6230063442 100755 --- a/meta/recipes-kernel/lttng/lttng-tools/run-ptest +++ b/meta/recipes-kernel/lttng/lttng-tools/run-ptest @@ -1,4 +1,5 @@ #!/bin/sh - -make -C tests installcheck - +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit" +make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null -- cgit 1.2.3-korg