summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2016-04-29 04:36:45 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:33:42 +0100
commit361c5be77f6e32d6eb68b94b93840c34453ba3f2 (patch)
treed31244e7b3d5a23ba4835b6577ee07965d5a5552 /meta
parentc7bf1a871a40ebb1153b6624a90a1781a662a0b2 (diff)
downloadpoky-361c5be77f6e32d6eb68b94b93840c34453ba3f2.tar.gz
lttng-tools: filter random filename of ptest output
When run the ptest of lttng-tools, it produced many random filename when the tests passed, the output confused QA analysis, so we need to filter the ptest output if tests passed and add up the passed and failed tests. NOTE:The tests invoked the run.sh twice, so it output like this: ... FAIL:... unit_tests statistics total pass: 133 tests passed! total fail: 5 tests failed! ... FAIL:... fast_regression statistics total pass: 1904 tests passed! total fail: 202 tests failed! (From OE-Core rev: 29a8c45be2862be02afe2ebbc5c026a42f351990) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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, 56 insertions, 0 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
new file mode 100644
index 0000000000..fed5a2fb59
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-lttng-tools-filter-random-filename-of-tests-output.patch
@@ -0,0 +1,55 @@
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 8bd09892ca..3ce4a9ee17 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -30,6 +30,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
30 file://Revert-Build-look-for-python-3.0-when-building-pytho.patch \ 30 file://Revert-Build-look-for-python-3.0-when-building-pytho.patch \
31 file://stop-using-SIGUNUSED.patch \ 31 file://stop-using-SIGUNUSED.patch \
32 file://runtest-2.4.0.patch \ 32 file://runtest-2.4.0.patch \
33 file://0001-lttng-tools-filter-random-filename-of-tests-output.patch \
33 file://run-ptest" 34 file://run-ptest"
34 35
35S = "${WORKDIR}/git" 36S = "${WORKDIR}/git"