diff options
| -rw-r--r-- | meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-extended/diffutils/diffutils_3.10.bb (renamed from meta/recipes-extended/diffutils/diffutils_3.9.bb) | 2 |
2 files changed, 8 insertions, 13 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 index 8b88c308f2..32793233f9 100644 --- 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 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001 | 1 | From f31395c931bc633206eccfcfaaaa5d15021a3e86 Mon Sep 17 00:00:00 2001 |
| 2 | From: Peiran Hong <peiran.hong@windriver.com> | 2 | From: Peiran Hong <peiran.hong@windriver.com> |
| 3 | Date: Thu, 5 Sep 2019 15:42:22 -0400 | 3 | Date: Thu, 5 Sep 2019 15:42:22 -0400 |
| 4 | Subject: [PATCH] Skip strip-trailing-cr test case | 4 | Subject: [PATCH] Skip strip-trailing-cr test case |
| @@ -12,23 +12,18 @@ Upstream-Status: Inappropriate [embedded specific] | |||
| 12 | Signed-off-by: Peiran Hong <peiran.hong@windriver.com> | 12 | Signed-off-by: Peiran Hong <peiran.hong@windriver.com> |
| 13 | 13 | ||
| 14 | --- | 14 | --- |
| 15 | tests/Makefile.am | 4 +++- | 15 | tests/Makefile.am | 1 - |
| 16 | 1 file changed, 3 insertions(+), 1 deletion(-) | 16 | 1 file changed, 1 deletion(-) |
| 17 | 17 | ||
| 18 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 18 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 19 | index d98df82..757ea52 100644 | 19 | index 79bacfb..4adb4d7 100644 |
| 20 | --- a/tests/Makefile.am | 20 | --- a/tests/Makefile.am |
| 21 | +++ b/tests/Makefile.am | 21 | +++ b/tests/Makefile.am |
| 22 | @@ -21,9 +21,11 @@ TESTS = \ | 22 | @@ -22,7 +22,6 @@ TESTS = \ |
| 23 | stdin \ | 23 | stdin \ |
| 24 | strcoll-0-names \ | 24 | strcoll-0-names \ |
| 25 | filename-quoting \ | 25 | filename-quoting \ |
| 26 | - strip-trailing-cr \ | 26 | - strip-trailing-cr \ |
| 27 | timezone \ | 27 | timezone \ |
| 28 | colors | 28 | colors \ |
| 29 | +# Skipping this test since it requires valgrind | 29 | y2038-vs-32bit |
| 30 | +# and thus is too heavy for diffutils package | ||
| 31 | +# strip-trailing-cr | ||
| 32 | |||
| 33 | XFAIL_TESTS = large-subopt | ||
| 34 | |||
diff --git a/meta/recipes-extended/diffutils/diffutils_3.9.bb b/meta/recipes-extended/diffutils/diffutils_3.10.bb index 2bb9e6f32d..08e8305612 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.9.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.10.bb | |||
| @@ -8,7 +8,7 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ | |||
| 8 | file://0001-Skip-strip-trailing-cr-test-case.patch \ | 8 | file://0001-Skip-strip-trailing-cr-test-case.patch \ |
| 9 | " | 9 | " |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1" | 11 | SRC_URI[sha256sum] = "90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e" |
| 12 | 12 | ||
| 13 | EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" | 13 | EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" |
| 14 | 14 | ||
