From d0d184045e8034ddbc77549e681f187e12ab1d08 Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Thu, 12 Sep 2013 01:09:50 +0000 Subject: lttng: Enable ptest support. Signed-off-by: Stefan Seefeld Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/lttng-tools/run-ptest | 4 ++ .../recipes-kernel/lttng/lttng-tools/runtest.patch | 52 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100755 meta/recipes-kernel/lttng/lttng-tools/run-ptest create mode 100644 meta/recipes-kernel/lttng/lttng-tools/runtest.patch (limited to 'meta/recipes-kernel/lttng/lttng-tools') diff --git a/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/meta/recipes-kernel/lttng/lttng-tools/run-ptest new file mode 100755 index 0000000000..e758815c77 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh + +make -C tests installcheck + diff --git a/meta/recipes-kernel/lttng/lttng-tools/runtest.patch b/meta/recipes-kernel/lttng/lttng-tools/runtest.patch new file mode 100644 index 0000000000..545a5dc083 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/runtest.patch @@ -0,0 +1,52 @@ +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/Makefile.am b/tests/Makefile.am +index 6d5b00d..3774f9d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,14 +1,17 @@ + SUBDIRS = utils regression unit stress + +-if USE_PYTHON +-check-am: ++installcheck-am: + ./run.sh unit_tests + ./run.sh fast_regression ++if USE_PYTHON + ./run.sh with_bindings_regression +-else ++endif ++ + check-am: + ./run.sh unit_tests + ./run.sh fast_regression ++if USE_PYTHON ++ ./run.sh with_bindings_regression + endif + + dist_noinst_SCRIPTS = run.sh unit_tests fast_regression long_regression root_regression with_bindings_regression +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' -- cgit v1.2.3