summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-11-23 10:16:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-23 23:35:19 +0000
commit41e772d72693d3fda4e7821a65ea96e2b873d96b (patch)
treed2ad880b760a95ce6857f6abfb00c79061b578d6
parent4d7f14780f8371d082b7d788ee6cfb71aae5eca1 (diff)
downloadpoky-41e772d72693d3fda4e7821a65ea96e2b873d96b.tar.gz
busybox: check CONFIG_DESKTOP before using 'od -t' in test case
The '-t' option support for 'od' is enabled by CONFIG_DESKTOP. So check it before using it in test cases. (From OE-Core rev: c89fa1992987fa3c12616d2d379f524188310a2e) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch83
-rw-r--r--meta/recipes-core/busybox/busybox_1.29.2.bb1
2 files changed, 84 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch b/meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch
new file mode 100644
index 0000000000..9b96eeeae5
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch
@@ -0,0 +1,83 @@
1From b09db631e77c63ebe733c69b00108f043f1f1d85 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 21 Nov 2018 10:00:29 +0800
4Subject: [PATCH] testsuite: check CONFIG_DESKTOP before using 'od -t'
5
6The '-t' option for od is enabled by CONFIG_DESKTOP. So
7check this config before using 'od -t' in test cases.
8
9Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2018-November/086895.html]
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12---
13 testsuite/echo/echo-prints-dash | 1 +
14 testsuite/echo/echo-prints-non-opts | 1 +
15 testsuite/echo/echo-prints-slash-zero | 2 +-
16 testsuite/echo/echo-prints-slash_00041 | 2 +-
17 testsuite/echo/echo-prints-slash_0041 | 2 +-
18 testsuite/echo/echo-prints-slash_041 | 2 +-
19 testsuite/echo/echo-prints-slash_41 | 2 +-
20 7 files changed, 7 insertions(+), 5 deletions(-)
21
22diff --git a/testsuite/echo/echo-prints-dash b/testsuite/echo/echo-prints-dash
23index ddcdbad..f1f31a0 100644
24--- a/testsuite/echo/echo-prints-dash
25+++ b/testsuite/echo/echo-prints-dash
26@@ -1 +1,2 @@
27+# FEATURE: CONFIG_DESKTOP
28 test "`busybox echo - | od -t x1 | head -n 1`" = "0000000 2d 0a"
29diff --git a/testsuite/echo/echo-prints-non-opts b/testsuite/echo/echo-prints-non-opts
30index c7d1e20..4e642a1 100644
31--- a/testsuite/echo/echo-prints-non-opts
32+++ b/testsuite/echo/echo-prints-non-opts
33@@ -1 +1,2 @@
34+# FEATURE: CONFIG_DESKTOP
35 test "`busybox echo -neEZ | od -t x1 | head -n 1`" = "0000000 2d 6e 65 45 5a 0a"
36diff --git a/testsuite/echo/echo-prints-slash-zero b/testsuite/echo/echo-prints-slash-zero
37index d97ed8e..948f899 100644
38--- a/testsuite/echo/echo-prints-slash-zero
39+++ b/testsuite/echo/echo-prints-slash-zero
40@@ -1,3 +1,3 @@
41-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
42+# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
43
44 test "`busybox echo -e -n 'msg\n\0' | od -t x1 | head -n 1`" = "0000000 6d 73 67 0a 00"
45diff --git a/testsuite/echo/echo-prints-slash_00041 b/testsuite/echo/echo-prints-slash_00041
46index 9cffabd..7ea217b 100644
47--- a/testsuite/echo/echo-prints-slash_00041
48+++ b/testsuite/echo/echo-prints-slash_00041
49@@ -1,3 +1,3 @@
50-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
51+# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
52
53 test "`busybox echo -ne '\00041z' | od -t x1 | head -n 1`" = "0000000 04 31 7a"
54diff --git a/testsuite/echo/echo-prints-slash_0041 b/testsuite/echo/echo-prints-slash_0041
55index b07429d..941faca 100644
56--- a/testsuite/echo/echo-prints-slash_0041
57+++ b/testsuite/echo/echo-prints-slash_0041
58@@ -1,3 +1,3 @@
59-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
60+# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
61
62 test "`busybox echo -ne '\0041z' | od -t x1 | head -n 1`" = "0000000 21 7a"
63diff --git a/testsuite/echo/echo-prints-slash_041 b/testsuite/echo/echo-prints-slash_041
64index 1d70cec..60cbfca 100644
65--- a/testsuite/echo/echo-prints-slash_041
66+++ b/testsuite/echo/echo-prints-slash_041
67@@ -1,3 +1,3 @@
68-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
69+# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
70
71 test "`busybox echo -ne '\041z' | od -t x1 | head -n 1`" = "0000000 21 7a"
72diff --git a/testsuite/echo/echo-prints-slash_41 b/testsuite/echo/echo-prints-slash_41
73index 6d8999b..afd7c36 100644
74--- a/testsuite/echo/echo-prints-slash_41
75+++ b/testsuite/echo/echo-prints-slash_41
76@@ -1,3 +1,3 @@
77-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
78+# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
79
80 test "`busybox echo -ne '\41z' | od -t x1 | head -n 1`" = "0000000 21 7a"
81--
822.7.4
83
diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb b/meta/recipes-core/busybox/busybox_1.29.2.bb
index f38db2a35a..66049bde96 100644
--- a/meta/recipes-core/busybox/busybox_1.29.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.29.2.bb
@@ -44,6 +44,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
44 file://0001-testsuite-check-uudecode-before-using-it.patch \ 44 file://0001-testsuite-check-uudecode-before-using-it.patch \
45 file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ 45 file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \
46 file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ 46 file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \
47 file://0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch \
47" 48"
48SRC_URI_append_libc-musl = " file://musl.cfg " 49SRC_URI_append_libc-musl = " file://musl.cfg "
49 50