summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmeta/recipes-kernel/lttng/lttng-tools/run-ptest4
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/runtest.patch52
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb8
3 files changed, 62 insertions, 2 deletions
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 @@
1#!/bin/sh
2
3make -C tests installcheck
4
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 @@
1diff --git a/Makefile.am b/Makefile.am
2index 584f59b..c2bcabd 100644
3--- a/Makefile.am
4+++ b/Makefile.am
5@@ -12,3 +12,9 @@ dist_doc_DATA = LICENSE \
6 dist_noinst_DATA = CodingStyle
7
8 EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt
9+
10+install-ptest:
11+ cp -r $(srcdir)/tests $(DESTDIR)
12+ for m in $$(find $(DESTDIR)/tests -name Makefile); do \
13+ sed -i -e 's|^Makefile:|_Makefile:|' $$m; \
14+ done
15diff --git a/tests/Makefile.am b/tests/Makefile.am
16index 6d5b00d..3774f9d 100644
17--- a/tests/Makefile.am
18+++ b/tests/Makefile.am
19@@ -1,14 +1,17 @@
20 SUBDIRS = utils regression unit stress
21
22-if USE_PYTHON
23-check-am:
24+installcheck-am:
25 ./run.sh unit_tests
26 ./run.sh fast_regression
27+if USE_PYTHON
28 ./run.sh with_bindings_regression
29-else
30+endif
31+
32 check-am:
33 ./run.sh unit_tests
34 ./run.sh fast_regression
35+if USE_PYTHON
36+ ./run.sh with_bindings_regression
37 endif
38
39 dist_noinst_SCRIPTS = run.sh unit_tests fast_regression long_regression root_regression with_bindings_regression
40diff --git a/tests/run.sh b/tests/run.sh
41index c6c50fd..6455359 100755
42--- a/tests/run.sh
43+++ b/tests/run.sh
44@@ -19,4 +19,7 @@
45
46 [ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1
47
48-prove --merge --exec '' - < $1
49+prove --merge -v --exec '' - < $1 | sed \
50+ -e 's|^ok \(.*\)|PASS: \1|' \
51+ -e 's|^not ok \(.*\)|FAIL: \1|' \
52+ | egrep -h 'PASS|FAIL'
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb
index 2e0ee15a29..4322027d7d 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.3.0.bb
@@ -10,15 +10,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" 10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
11 11
12DEPENDS = "liburcu popt lttng-ust" 12DEPENDS = "liburcu popt lttng-ust"
13RDEPENDS_${PN}-ptest += "make"
13 14
14SRCREV = "c9dc1289e040c542f96fbfd558267786816d5703" 15SRCREV = "c9dc1289e040c542f96fbfd558267786816d5703"
15PV = "v2.3.0" 16PV = "v2.3.0"
16 17
17SRC_URI = "git://git.lttng.org/lttng-tools.git" 18SRC_URI = "git://git.lttng.org/lttng-tools.git \
19 file://runtest.patch \
20 file://run-ptest \
21 "
18 22
19S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
20 24
21inherit autotools 25inherit autotools ptest
22 26
23export KERNELDIR="${STAGING_KERNEL_DIR}" 27export KERNELDIR="${STAGING_KERNEL_DIR}"
24 28