summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch35
-rw-r--r--meta/recipes-extended/diffutils/diffutils_3.7.bb3
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
new file mode 100644
index 0000000000..aac1c43465
--- /dev/null
+++ b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
@@ -0,0 +1,35 @@
1From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001
2From: Peiran Hong <peiran.hong@windriver.com>
3Date: Thu, 5 Sep 2019 15:42:22 -0400
4Subject: [PATCH] Skip strip-trailing-cr test case
5
6Skip the test "strip-trailing-cr" since it requires valgrind to
7work, but valgrind is considered too heavy-weight for diffutils
8package.
9
10Upstream-Status: Inappropriate [embedded specific]
11
12Signed-off-by: Peiran Hong <peiran.hong@windriver.com>
13---
14 tests/Makefile.am | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17diff --git a/tests/Makefile.am b/tests/Makefile.am
18index 83a7c9d..04d51b5 100644
19--- a/tests/Makefile.am
20+++ b/tests/Makefile.am
21@@ -21,8 +21,10 @@ TESTS = \
22 stdin \
23 strcoll-0-names \
24 filename-quoting \
25- strip-trailing-cr \
26 colors
27+# Skipping this test since it requires valgrind
28+# and thus is too heavy for diffutils package
29+# strip-trailing-cr
30
31 XFAIL_TESTS = large-subopt
32
33--
342.21.0
35
diff --git a/meta/recipes-extended/diffutils/diffutils_3.7.bb b/meta/recipes-extended/diffutils/diffutils_3.7.bb
index 7daeee3513..8111ae6065 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.7.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.7.bb
@@ -5,6 +5,7 @@ require diffutils.inc
5 5
6SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ 6SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
7 file://run-ptest \ 7 file://run-ptest \
8 file://0001-Skip-strip-trailing-cr-test-case.patch \
8" 9"
9 10
10SRC_URI[md5sum] = "4824adc0e95dbbf11dfbdfaad6a1e461" 11SRC_URI[md5sum] = "4824adc0e95dbbf11dfbdfaad6a1e461"
@@ -17,7 +18,7 @@ acpaths = "-I ./m4"
17 18
18inherit ptest 19inherit ptest
19 20
20RDEPENDS_${PN}-ptest += "make" 21RDEPENDS_${PN}-ptest += "make perl"
21 22
22do_install_ptest() { 23do_install_ptest() {
23 t=${D}${PTEST_PATH} 24 t=${D}${PTEST_PATH}