diff options
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/runtest.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/runtest.patch b/meta/recipes-kernel/lttng/lttng-tools/runtest.patch deleted file mode 100644 index 545a5dc083..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools/runtest.patch +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | diff --git a/Makefile.am b/Makefile.am | ||
| 2 | index 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 | ||
| 15 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
| 16 | index 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 | ||
| 40 | diff --git a/tests/run.sh b/tests/run.sh | ||
| 41 | index 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' | ||
