aboutsummaryrefslogtreecommitdiff
path: root/shell/ash_test
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-09-15 13:33:02 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2010-09-15 13:33:02 +0200
commit063847d6bd23e184c409f37645ba90fa4d039ada (patch)
tree63e360e3e0a2f46d187ef2e21487753a52697efa /shell/ash_test
parent197a6b3c14a8be7101903118516e0e16ec843eb5 (diff)
downloadbusybox-w32-063847d6bd23e184c409f37645ba90fa4d039ada.tar.gz
busybox-w32-063847d6bd23e184c409f37645ba90fa4d039ada.tar.bz2
busybox-w32-063847d6bd23e184c409f37645ba90fa4d039ada.zip
shell/math: return string error indicator, not integer
function old new delta expand_and_evaluate_arith 87 106 +19 expand_one_var 1563 1570 +7 arith 12 18 +6 evaluate_string 678 680 +2 arith_apply 1269 1271 +2 builtin_umask 133 132 -1 ash_arith 118 75 -43 expand_vars_to_list 1094 1038 -56 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 5/3 up/down: 36/-100) Total: -64 bytes Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'shell/ash_test')
-rw-r--r--shell/ash_test/ash-arith/arith.right56
1 files changed, 28 insertions, 28 deletions
diff --git a/shell/ash_test/ash-arith/arith.right b/shell/ash_test/ash-arith/arith.right
index 3ea7ce680..7257cc566 100644
--- a/shell/ash_test/ash-arith/arith.right
+++ b/shell/ash_test/ash-arith/arith.right
@@ -55,28 +55,28 @@ Format: 'expected actual'
5530 30 5530 30
5620 20 5620 20
5730 30 5730 30
58./arith.tests: line 117: syntax error: 1 ? 20 : x+=2 58./arith.tests: line 117: arithmetic syntax error
596 6 596 6
606,5,3 6,5,3 606,5,3 6,5,3
61263 263 61263 263
62255 255 62255 255
6340 40 6340 40
64./arith.tests: line 163: syntax error: 7 = 43 64./arith.tests: line 163: arithmetic syntax error
65./arith.tests: line 165: divide by zero 65./arith.tests: line 165: divide by zero
66./arith.tests: let: line 166: syntax error: jv += $iv 66./arith.tests: let: line 166: arithmetic syntax error
67./arith.tests: line 167: syntax error: jv += $iv 67./arith.tests: line 167: arithmetic syntax error
68./arith.tests: let: line 168: syntax error: rv = 7 + (43 * 6 68./arith.tests: let: line 168: arithmetic syntax error
69abc 69abc
70def 70def
71ghi 71ghi
72./arith.tests: line 191: syntax error: ( 4 + A ) + 4 72./arith.tests: line 191: arithmetic syntax error
7316 16 7316 16
74./arith.tests: line 196: syntax error: 4 ? : 3 + 5 74./arith.tests: line 196: arithmetic syntax error
75./arith.tests: line 197: syntax error: 1 ? 20 75./arith.tests: line 197: arithmetic syntax error
76./arith.tests: line 198: syntax error: 4 ? 20 : 76./arith.tests: line 198: arithmetic syntax error
779 9 779 9
78./arith.tests: line 205: syntax error: 0 && B=42 78./arith.tests: line 205: arithmetic syntax error
79./arith.tests: line 208: syntax error: 1 || B=88 79./arith.tests: line 208: arithmetic syntax error
809 9 809 9
819 9 819 9
829 9 829 9
@@ -97,18 +97,18 @@ ghi
973 3 973 3
984 4 984 4
994 4 994 4
100./arith.tests: line 257: syntax error: 7-- 100./arith.tests: line 257: arithmetic syntax error
101./arith.tests: line 259: syntax error: --x=7 101./arith.tests: line 259: arithmetic syntax error
102./arith.tests: line 260: syntax error: ++x=7 102./arith.tests: line 260: arithmetic syntax error
103./arith.tests: line 262: syntax error: x++=7 103./arith.tests: line 262: arithmetic syntax error
104./arith.tests: line 263: syntax error: x--=7 104./arith.tests: line 263: arithmetic syntax error
1054 4 1054 4
1067 7 1067 7
107-7 -7 107-7 -7
108./arith1.sub: line 2: syntax error: 4-- 108./arith1.sub: line 2: arithmetic syntax error
109./arith1.sub: line 3: syntax error: 4++ 109./arith1.sub: line 3: arithmetic syntax error
110./arith1.sub: line 4: syntax error: 4 -- 110./arith1.sub: line 4: arithmetic syntax error
111./arith1.sub: line 5: syntax error: 4 ++ 111./arith1.sub: line 5: arithmetic syntax error
1126 6 1126 6
1133 3 1133 3
1147 7 1147 7
@@ -119,19 +119,19 @@ ghi
1192 2 1192 2
120-2 -2 120-2 -2
1211 1 1211 1
122./arith1.sub: line 37: syntax error: +++7 122./arith1.sub: line 37: arithmetic syntax error
123./arith2.sub: line 2: syntax error: --7 123./arith2.sub: line 2: arithmetic syntax error
124./arith2.sub: line 3: syntax error: ++7 124./arith2.sub: line 3: arithmetic syntax error
125./arith2.sub: line 4: syntax error: -- 7 125./arith2.sub: line 4: arithmetic syntax error
126./arith2.sub: line 5: syntax error: ++ 7 126./arith2.sub: line 5: arithmetic syntax error
1275 5 1275 5
1281 1 1281 1
1294 4 1294 4
1300 0 1300 0
131./arith2.sub: line 42: syntax error: -- - 7 131./arith2.sub: line 42: arithmetic syntax error
132./arith2.sub: line 47: syntax error: ++ + 7 132./arith2.sub: line 47: arithmetic syntax error
1338 12 1338 12
134./arith.tests: line 290: syntax error: a b 134./arith.tests: line 290: arithmetic syntax error
13542 13542
13642 13642
13742 13742