aboutsummaryrefslogtreecommitdiffstats
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-07-28 21:30:16 +0100
commiteeb0a912145f8f849d56c04e38616d12ca8be21e (patch)
tree889a4df0107f87e88b1b3458ed231dcd70813ca2
parente7b2362d723b5dcabb440cd513380bfe8a0badb2 (diff)
downloadopenembedded-core-contrib-eeb0a912145f8f849d56c04e38616d12ca8be21e.tar.gz
openembedded-core-contrib-eeb0a912145f8f849d56c04e38616d12ca8be21e.tar.bz2
openembedded-core-contrib-eeb0a912145f8f849d56c04e38616d12ca8be21e.zip
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). Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 fed5a2fb59d..00000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-lttng-tools-filter-random-filename-of-tests-output.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b9744428d6dfb1cba7b6e3fdbf0613977914b12f Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Fri, 29 Apr 2016 03:25:58 -0400
-Subject: [PATCH] lttng-tools: filter random filename of tests output
-
-Show the failed tests, filter the random filename when the test
-passed, add up the result.
-
-Upstream-Status: Pending
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
- tests/run.sh | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/tests/run.sh b/tests/run.sh
-index 6455359..9080afc 100755
---- a/tests/run.sh
-+++ b/tests/run.sh
-@@ -17,9 +17,30 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
-+# Define two variable to store the passed and failed result
-+pass_count=0
-+fail_count=0
-+
- [ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1
-
--prove --merge -v --exec '' - < $1 | sed \
-+# Using a while loop to add up the passed and failed result, we use Here Strings
-+# "<<<" in bash in order to redirect the test output to the while loop. If put the
-+# test output as a pipeline, the while loop will run in subshell, we can't get the
-+# pass_count and fail_count when the subshell exit.
-+while read line
-+do
-+ if [[ $line == "FAIL"* ]]; then
-+ echo $line;((fail_count=fail_count+1))
-+ fi
-+ if [[ $line == "PASS"* ]]; then
-+ ((pass_count=pass_count+1))
-+ fi
-+done <<< "$(prove --merge -v --exec '' - < $1 | sed \
- -e 's|^ok \(.*\)|PASS: \1|' \
- -e 's|^not ok \(.*\)|FAIL: \1|' \
-- | egrep -h 'PASS|FAIL'
-+ | egrep -h 'PASS|FAIL')"
-+
-+# Add up the result and output the passed and failed tests
-+echo "$1 statistics"
-+echo "total pass: $pass_count tests passed!"
-+echo "total fail: $fail_count tests failed!"
---
-2.8.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index da2b68552bc..b0c369ce964 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"
SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
file://stop-using-SIGUNUSED.patch \
file://runtest-2.4.0.patch \
- file://0001-lttng-tools-filter-random-filename-of-tests-output.patch \
file://run-ptest"
S = "${WORKDIR}/git"