summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorNathan Lynch <nathan_lynch@mentor.com>2016-07-22 15:53:46 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-01 11:47:10 +0100
commitbaaaea5145af375a7630751f024ef5cb82ae7a2b (patch)
tree4c724983e98f8197bf4d85be2d2e718b9ce2ec03 /meta/recipes-kernel
parent2c01447ea693fb30cd1b7b6ac798a43f79c261a6 (diff)
downloadpoky-baaaea5145af375a7630751f024ef5cb82ae7a2b.tar.gz
Revert "lttng-tools: filter random filename of ptest output"
This reverts commit 29a8c45be2862be02afe2ebbc5c026a42f351990. A few things wrong with this change: 1. It patches a patch (runtest-2.4.0.patch). 2. It introduces deviations from the desired ptest output format. 3. It discards PASS: lines from the test output; I *want* to see those. 4. The upstream status of "pending" is incorrect; I do not see this patch on the lttng-dev mailing list (not that it would apply anyway). (From OE-Core rev: eeb0a912145f8f849d56c04e38616d12ca8be21e) Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-lttng-tools-filter-random-filename-of-tests-output.patch55
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb1
2 files changed, 0 insertions, 56 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-lttng-tools-filter-random-filename-of-tests-output.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-lttng-tools-filter-random-filename-of-tests-output.patch
deleted file mode 100644
index fed5a2fb59..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-lttng-tools-filter-random-filename-of-tests-output.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From b9744428d6dfb1cba7b6e3fdbf0613977914b12f Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Fri, 29 Apr 2016 03:25:58 -0400
4Subject: [PATCH] lttng-tools: filter random filename of tests output
5
6Show the failed tests, filter the random filename when the test
7passed, add up the result.
8
9Upstream-Status: Pending
10
11Signed-off-by: Dengke Du <dengke.du@windriver.com>
12---
13 tests/run.sh | 25 +++++++++++++++++++++++--
14 1 file changed, 23 insertions(+), 2 deletions(-)
15
16diff --git a/tests/run.sh b/tests/run.sh
17index 6455359..9080afc 100755
18--- a/tests/run.sh
19+++ b/tests/run.sh
20@@ -17,9 +17,30 @@
21 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
22 #
23
24+# Define two variable to store the passed and failed result
25+pass_count=0
26+fail_count=0
27+
28 [ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1
29
30-prove --merge -v --exec '' - < $1 | sed \
31+# Using a while loop to add up the passed and failed result, we use Here Strings
32+# "<<<" in bash in order to redirect the test output to the while loop. If put the
33+# test output as a pipeline, the while loop will run in subshell, we can't get the
34+# pass_count and fail_count when the subshell exit.
35+while read line
36+do
37+ if [[ $line == "FAIL"* ]]; then
38+ echo $line;((fail_count=fail_count+1))
39+ fi
40+ if [[ $line == "PASS"* ]]; then
41+ ((pass_count=pass_count+1))
42+ fi
43+done <<< "$(prove --merge -v --exec '' - < $1 | sed \
44 -e 's|^ok \(.*\)|PASS: \1|' \
45 -e 's|^not ok \(.*\)|FAIL: \1|' \
46- | egrep -h 'PASS|FAIL'
47+ | egrep -h 'PASS|FAIL')"
48+
49+# Add up the result and output the passed and failed tests
50+echo "$1 statistics"
51+echo "total pass: $pass_count tests passed!"
52+echo "total fail: $fail_count tests failed!"
53--
542.8.1
55
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index da2b68552b..b0c369ce96 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -29,7 +29,6 @@ PACKAGECONFIG_remove_libc-musl = "lttng-ust"
29SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ 29SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
30 file://stop-using-SIGUNUSED.patch \ 30 file://stop-using-SIGUNUSED.patch \
31 file://runtest-2.4.0.patch \ 31 file://runtest-2.4.0.patch \
32 file://0001-lttng-tools-filter-random-filename-of-tests-output.patch \
33 file://run-ptest" 32 file://run-ptest"
34 33
35S = "${WORKDIR}/git" 34S = "${WORKDIR}/git"