diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2023-05-25 19:51:37 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2023-05-25 19:51:37 +0200 |
commit | ce4cfc33cade63513963f9d5e701f305cbdfe693 (patch) | |
tree | a0ab6bee9f3fb99c1c30e632fe25cb75fd359683 /testsuite | |
parent | e2287f99fe6f21fd6435ad04340170ad4ba5f6b3 (diff) | |
download | busybox-w32-ce4cfc33cade63513963f9d5e701f305cbdfe693.tar.gz busybox-w32-ce4cfc33cade63513963f9d5e701f305cbdfe693.tar.bz2 busybox-w32-ce4cfc33cade63513963f9d5e701f305cbdfe693.zip |
od: correct -i, enable tests which pass for DESKTOP too
function old new delta
.rodata 105302 105305 +3
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite')
-rwxr-xr-x | testsuite/od.tests | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/testsuite/od.tests b/testsuite/od.tests index 500e0e638..fa6745b78 100755 --- a/testsuite/od.tests +++ b/testsuite/od.tests | |||
@@ -12,10 +12,10 @@ le=false | |||
12 | { printf '\0\1' | od -s | grep -q 256; } && le=true | 12 | { printf '\0\1' | od -s | grep -q 256; } && le=true |
13 | readonly le | 13 | readonly le |
14 | 14 | ||
15 | # NB: | 15 | # NB: for !DESKTOP, |
16 | # sed 's/ *$//' truncates trailing spaces. | 16 | # sed 's/ *$//' truncates trailing spaces. |
17 | # This needs to be fixed properly (not output them). | 17 | # This needs to be fixed properly (by not outputting them). |
18 | # For now, the tests ignore them (does not require a match). | 18 | # For now, the tests ignore them (do not require a match). |
19 | 19 | ||
20 | optional !DESKTOP | 20 | optional !DESKTOP |
21 | testing "od -a (!DESKTOP)" \ | 21 | testing "od -a (!DESKTOP)" \ |
@@ -26,8 +26,19 @@ testing "od -a (!DESKTOP)" \ | |||
26 | " \ | 26 | " \ |
27 | "" "$input" | 27 | "" "$input" |
28 | SKIP= | 28 | SKIP= |
29 | # ^^^ a bit incorrect handling of ctrl/high bytes. | ||
30 | # vvv this output is correct. | ||
31 | optional DESKTOP | ||
32 | testing "od -a (DESKTOP)" \ | ||
33 | "od -a" \ | ||
34 | "\ | ||
35 | 0000000 soh stx etx nl A B C ~ | ||
36 | 0000010 | ||
37 | " \ | ||
38 | "" "$input" | ||
39 | SKIP= | ||
29 | 40 | ||
30 | optional !DESKTOP | 41 | optional !DESKTOP #DESKTOP: unrecognized option: B |
31 | testing "od -B (!DESKTOP)" \ | 42 | testing "od -B (!DESKTOP)" \ |
32 | "od -B | sed 's/ *$//'" \ | 43 | "od -B | sed 's/ *$//'" \ |
33 | "\ | 44 | "\ |
@@ -37,9 +48,8 @@ testing "od -B (!DESKTOP)" \ | |||
37 | "" "$input" | 48 | "" "$input" |
38 | SKIP= | 49 | SKIP= |
39 | 50 | ||
40 | optional !DESKTOP | ||
41 | $le || SKIP=1 | 51 | $le || SKIP=1 |
42 | testing "od -o (!DESKTOP little-endian)" \ | 52 | testing "od -o (little-endian)" \ |
43 | "od -o | sed 's/ *$//'" \ | 53 | "od -o | sed 's/ *$//'" \ |
44 | "\ | 54 | "\ |
45 | 0000000 001001 005003 041101 177103 | 55 | 0000000 001001 005003 041101 177103 |
@@ -48,8 +58,7 @@ testing "od -o (!DESKTOP little-endian)" \ | |||
48 | "" "$input" | 58 | "" "$input" |
49 | SKIP= | 59 | SKIP= |
50 | 60 | ||
51 | optional !DESKTOP | 61 | testing "od -b" \ |
52 | testing "od -b (!DESKTOP)" \ | ||
53 | "od -b | sed 's/ *$//'" \ | 62 | "od -b | sed 's/ *$//'" \ |
54 | "\ | 63 | "\ |
55 | 0000000 001 002 003 012 101 102 103 376 | 64 | 0000000 001 002 003 012 101 102 103 376 |
@@ -58,8 +67,7 @@ testing "od -b (!DESKTOP)" \ | |||
58 | "" "$input" | 67 | "" "$input" |
59 | SKIP= | 68 | SKIP= |
60 | 69 | ||
61 | optional !DESKTOP | 70 | testing "od -c" \ |
62 | testing "od -c (!DESKTOP)" \ | ||
63 | "od -c | sed 's/ *$//'" \ | 71 | "od -c | sed 's/ *$//'" \ |
64 | "\ | 72 | "\ |
65 | 0000000 001 002 003 \\\\n A B C 376 | 73 | 0000000 001 002 003 \\\\n A B C 376 |
@@ -68,9 +76,8 @@ testing "od -c (!DESKTOP)" \ | |||
68 | "" "$input" | 76 | "" "$input" |
69 | SKIP= | 77 | SKIP= |
70 | 78 | ||
71 | optional !DESKTOP | ||
72 | $le || SKIP=1 | 79 | $le || SKIP=1 |
73 | testing "od -d (!DESKTOP little-endian)" \ | 80 | testing "od -d (little-endian)" \ |
74 | "od -d | sed 's/ *$//'" \ | 81 | "od -d | sed 's/ *$//'" \ |
75 | "\ | 82 | "\ |
76 | 0000000 513 2563 16961 65091 | 83 | 0000000 513 2563 16961 65091 |
@@ -79,7 +86,7 @@ testing "od -d (!DESKTOP little-endian)" \ | |||
79 | "" "$input" | 86 | "" "$input" |
80 | SKIP= | 87 | SKIP= |
81 | 88 | ||
82 | optional !DESKTOP | 89 | optional !DESKTOP #DESKTOP: unrecognized option: D |
83 | $le || SKIP=1 | 90 | $le || SKIP=1 |
84 | testing "od -D (!DESKTOP little-endian)" \ | 91 | testing "od -D (!DESKTOP little-endian)" \ |
85 | "od -D | sed 's/ *$//'" \ | 92 | "od -D | sed 's/ *$//'" \ |
@@ -90,7 +97,7 @@ testing "od -D (!DESKTOP little-endian)" \ | |||
90 | "" "$input" | 97 | "" "$input" |
91 | SKIP= | 98 | SKIP= |
92 | 99 | ||
93 | optional !DESKTOP | 100 | optional !DESKTOP #DESKTOP: unrecognized option: e |
94 | $le || SKIP=1 | 101 | $le || SKIP=1 |
95 | testing "od -e (!DESKTOP little-endian)" \ | 102 | testing "od -e (!DESKTOP little-endian)" \ |
96 | "od -e | sed 's/ *$//'" \ | 103 | "od -e | sed 's/ *$//'" \ |
@@ -101,7 +108,7 @@ testing "od -e (!DESKTOP little-endian)" \ | |||
101 | "" "$input" | 108 | "" "$input" |
102 | SKIP= | 109 | SKIP= |
103 | 110 | ||
104 | optional !DESKTOP | 111 | optional !DESKTOP #DESKTOP: unrecognized option: F |
105 | $le || SKIP=1 | 112 | $le || SKIP=1 |
106 | testing "od -F (!DESKTOP little-endian)" \ | 113 | testing "od -F (!DESKTOP little-endian)" \ |
107 | "od -F | sed 's/ *$//'" \ | 114 | "od -F | sed 's/ *$//'" \ |
@@ -111,7 +118,7 @@ testing "od -F (!DESKTOP little-endian)" \ | |||
111 | " \ | 118 | " \ |
112 | "" "$input" | 119 | "" "$input" |
113 | 120 | ||
114 | optional !DESKTOP | 121 | #optional !DESKTOP |
115 | $le || SKIP=1 | 122 | $le || SKIP=1 |
116 | testing "od -f (!DESKTOP little-endian)" \ | 123 | testing "od -f (!DESKTOP little-endian)" \ |
117 | "od -f | sed 's/ *$//'" \ | 124 | "od -f | sed 's/ *$//'" \ |
@@ -122,7 +129,7 @@ testing "od -f (!DESKTOP little-endian)" \ | |||
122 | "" "$input" | 129 | "" "$input" |
123 | SKIP= | 130 | SKIP= |
124 | 131 | ||
125 | optional !DESKTOP | 132 | optional !DESKTOP #DESKTOP: unrecognized option: H |
126 | $le || SKIP=1 | 133 | $le || SKIP=1 |
127 | testing "od -H (!DESKTOP little-endian)" \ | 134 | testing "od -H (!DESKTOP little-endian)" \ |
128 | "od -H | sed 's/ *$//'" \ | 135 | "od -H | sed 's/ *$//'" \ |
@@ -133,7 +140,7 @@ testing "od -H (!DESKTOP little-endian)" \ | |||
133 | "" "$input" | 140 | "" "$input" |
134 | SKIP= | 141 | SKIP= |
135 | 142 | ||
136 | optional !DESKTOP | 143 | optional !DESKTOP #DESKTOP: unrecognized option: X |
137 | $le || SKIP=1 | 144 | $le || SKIP=1 |
138 | testing "od -X (!DESKTOP little-endian)" \ | 145 | testing "od -X (!DESKTOP little-endian)" \ |
139 | "od -X | sed 's/ *$//'" \ | 146 | "od -X | sed 's/ *$//'" \ |
@@ -144,9 +151,8 @@ testing "od -X (!DESKTOP little-endian)" \ | |||
144 | "" "$input" | 151 | "" "$input" |
145 | SKIP= | 152 | SKIP= |
146 | 153 | ||
147 | optional !DESKTOP | ||
148 | $le || SKIP=1 | 154 | $le || SKIP=1 |
149 | testing "od -h (!DESKTOP little-endian)" \ | 155 | testing "od -h (little-endian)" \ |
150 | "od -h | sed 's/ *$//'" \ | 156 | "od -h | sed 's/ *$//'" \ |
151 | "\ | 157 | "\ |
152 | 0000000 0201 0a03 4241 fe43 | 158 | 0000000 0201 0a03 4241 fe43 |
@@ -155,9 +161,8 @@ testing "od -h (!DESKTOP little-endian)" \ | |||
155 | "" "$input" | 161 | "" "$input" |
156 | SKIP= | 162 | SKIP= |
157 | 163 | ||
158 | optional !DESKTOP | ||
159 | $le || SKIP=1 | 164 | $le || SKIP=1 |
160 | testing "od -x (!DESKTOP little-endian)" \ | 165 | testing "od -x (little-endian)" \ |
161 | "od -x | sed 's/ *$//'" \ | 166 | "od -x | sed 's/ *$//'" \ |
162 | "\ | 167 | "\ |
163 | 0000000 0201 0a03 4241 fe43 | 168 | 0000000 0201 0a03 4241 fe43 |
@@ -166,7 +171,7 @@ testing "od -x (!DESKTOP little-endian)" \ | |||
166 | "" "$input" | 171 | "" "$input" |
167 | SKIP= | 172 | SKIP= |
168 | 173 | ||
169 | optional !DESKTOP | 174 | optional !DESKTOP #DESKTOP: unrecognized option: I |
170 | $le || SKIP=1 | 175 | $le || SKIP=1 |
171 | testing "od -I (!DESKTOP little-endian)" \ | 176 | testing "od -I (!DESKTOP little-endian)" \ |
172 | "od -I | sed 's/ *$//'" \ | 177 | "od -I | sed 's/ *$//'" \ |
@@ -177,7 +182,7 @@ testing "od -I (!DESKTOP little-endian)" \ | |||
177 | "" "$input" | 182 | "" "$input" |
178 | SKIP= | 183 | SKIP= |
179 | 184 | ||
180 | optional !DESKTOP | 185 | optional !DESKTOP #DESKTOP: unrecognized option: L |
181 | $le || SKIP=1 | 186 | $le || SKIP=1 |
182 | testing "od -L (!DESKTOP little-endian)" \ | 187 | testing "od -L (!DESKTOP little-endian)" \ |
183 | "od -L | sed 's/ *$//'" \ | 188 | "od -L | sed 's/ *$//'" \ |
@@ -188,9 +193,8 @@ testing "od -L (!DESKTOP little-endian)" \ | |||
188 | "" "$input" | 193 | "" "$input" |
189 | SKIP= | 194 | SKIP= |
190 | 195 | ||
191 | optional !DESKTOP | ||
192 | $le || SKIP=1 | 196 | $le || SKIP=1 |
193 | testing "od -i (!DESKTOP little-endian)" \ | 197 | testing "od -i (little-endian)" \ |
194 | "od -i | sed 's/ *$//'" \ | 198 | "od -i | sed 's/ *$//'" \ |
195 | "\ | 199 | "\ |
196 | 0000000 167969281 -29146559 | 200 | 0000000 167969281 -29146559 |
@@ -199,7 +203,7 @@ testing "od -i (!DESKTOP little-endian)" \ | |||
199 | "" "$input" | 203 | "" "$input" |
200 | SKIP= | 204 | SKIP= |
201 | 205 | ||
202 | optional !DESKTOP | 206 | optional !DESKTOP #DESKTOP: unrecognized option: O |
203 | $le || SKIP=1 | 207 | $le || SKIP=1 |
204 | testing "od -O (!DESKTOP little-endian)" \ | 208 | testing "od -O (!DESKTOP little-endian)" \ |
205 | "od -O | sed 's/ *$//'" \ | 209 | "od -O | sed 's/ *$//'" \ |
@@ -210,9 +214,9 @@ testing "od -O (!DESKTOP little-endian)" \ | |||
210 | "" "$input" | 214 | "" "$input" |
211 | SKIP= | 215 | SKIP= |
212 | 216 | ||
213 | optional !DESKTOP | 217 | # This probably also depends on word width of the arch (what is "long"?) |
214 | $le || SKIP=1 | 218 | $le || SKIP=1 |
215 | testing "od -l (!DESKTOP little-endian)" \ | 219 | testing "od -l (little-endian)" \ |
216 | "od -l | sed 's/ *$//'" \ | 220 | "od -l | sed 's/ *$//'" \ |
217 | "\ | 221 | "\ |
218 | 0000000 -125183517527965183 | 222 | 0000000 -125183517527965183 |