diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools')
-rwxr-xr-x | meta/recipes-kernel/lttng/lttng-tools/run-ptest | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch | 27 |
2 files changed, 4 insertions, 30 deletions
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 diff --git a/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch b/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch deleted file mode 100644 index 958bce48e0..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 584f59b..c2bcabd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,3 +12,9 @@ dist_doc_DATA = LICENSE \ - dist_noinst_DATA = CodingStyle - - EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt -+ -+install-ptest: -+ cp -r $(srcdir)/tests $(DESTDIR) -+ for m in $$(find $(DESTDIR)/tests -name Makefile); do \ -+ sed -i -e 's|^Makefile:|_Makefile:|' $$m; \ -+ done -diff --git a/tests/run.sh b/tests/run.sh -index c6c50fd..6455359 100755 ---- a/tests/run.sh -+++ b/tests/run.sh -@@ -19,4 +19,7 @@ - - [ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1 - --prove --merge --exec '' - < $1 -+prove --merge -v --exec '' - < $1 | sed \ -+ -e 's|^ok \(.*\)|PASS: \1|' \ -+ -e 's|^not ok \(.*\)|FAIL: \1|' \ -+ | egrep -h 'PASS|FAIL' |