diff options
author | Denys Vlasenko | 2010-09-15 13:33:02 +0200 |
---|---|---|
committer | Denys Vlasenko | 2010-09-15 13:33:02 +0200 |
commit | 063847d6bd23e184c409f37645ba90fa4d039ada (patch) | |
tree | 63e360e3e0a2f46d187ef2e21487753a52697efa /shell/ash_test | |
parent | 197a6b3c14a8be7101903118516e0e16ec843eb5 (diff) | |
download | busybox-063847d6bd23e184c409f37645ba90fa4d039ada.zip busybox-063847d6bd23e184c409f37645ba90fa4d039ada.tar.gz |
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.right | 56 |
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 3ea7ce6..7257cc5 100644 --- a/shell/ash_test/ash-arith/arith.right +++ b/shell/ash_test/ash-arith/arith.right @@ -55,28 +55,28 @@ Format: 'expected actual' 30 30 20 20 30 30 -./arith.tests: line 117: syntax error: 1 ? 20 : x+=2 +./arith.tests: line 117: arithmetic syntax error 6 6 6,5,3 6,5,3 263 263 255 255 40 40 -./arith.tests: line 163: syntax error: 7 = 43 +./arith.tests: line 163: arithmetic syntax error ./arith.tests: line 165: divide by zero -./arith.tests: let: line 166: syntax error: jv += $iv -./arith.tests: line 167: syntax error: jv += $iv -./arith.tests: let: line 168: syntax error: rv = 7 + (43 * 6 +./arith.tests: let: line 166: arithmetic syntax error +./arith.tests: line 167: arithmetic syntax error +./arith.tests: let: line 168: arithmetic syntax error abc def ghi -./arith.tests: line 191: syntax error: ( 4 + A ) + 4 +./arith.tests: line 191: arithmetic syntax error 16 16 -./arith.tests: line 196: syntax error: 4 ? : 3 + 5 -./arith.tests: line 197: syntax error: 1 ? 20 -./arith.tests: line 198: syntax error: 4 ? 20 : +./arith.tests: line 196: arithmetic syntax error +./arith.tests: line 197: arithmetic syntax error +./arith.tests: line 198: arithmetic syntax error 9 9 -./arith.tests: line 205: syntax error: 0 && B=42 -./arith.tests: line 208: syntax error: 1 || B=88 +./arith.tests: line 205: arithmetic syntax error +./arith.tests: line 208: arithmetic syntax error 9 9 9 9 9 9 @@ -97,18 +97,18 @@ ghi 3 3 4 4 4 4 -./arith.tests: line 257: syntax error: 7-- -./arith.tests: line 259: syntax error: --x=7 -./arith.tests: line 260: syntax error: ++x=7 -./arith.tests: line 262: syntax error: x++=7 -./arith.tests: line 263: syntax error: x--=7 +./arith.tests: line 257: arithmetic syntax error +./arith.tests: line 259: arithmetic syntax error +./arith.tests: line 260: arithmetic syntax error +./arith.tests: line 262: arithmetic syntax error +./arith.tests: line 263: arithmetic syntax error 4 4 7 7 -7 -7 -./arith1.sub: line 2: syntax error: 4-- -./arith1.sub: line 3: syntax error: 4++ -./arith1.sub: line 4: syntax error: 4 -- -./arith1.sub: line 5: syntax error: 4 ++ +./arith1.sub: line 2: arithmetic syntax error +./arith1.sub: line 3: arithmetic syntax error +./arith1.sub: line 4: arithmetic syntax error +./arith1.sub: line 5: arithmetic syntax error 6 6 3 3 7 7 @@ -119,19 +119,19 @@ ghi 2 2 -2 -2 1 1 -./arith1.sub: line 37: syntax error: +++7 -./arith2.sub: line 2: syntax error: --7 -./arith2.sub: line 3: syntax error: ++7 -./arith2.sub: line 4: syntax error: -- 7 -./arith2.sub: line 5: syntax error: ++ 7 +./arith1.sub: line 37: arithmetic syntax error +./arith2.sub: line 2: arithmetic syntax error +./arith2.sub: line 3: arithmetic syntax error +./arith2.sub: line 4: arithmetic syntax error +./arith2.sub: line 5: arithmetic syntax error 5 5 1 1 4 4 0 0 -./arith2.sub: line 42: syntax error: -- - 7 -./arith2.sub: line 47: syntax error: ++ + 7 +./arith2.sub: line 42: arithmetic syntax error +./arith2.sub: line 47: arithmetic syntax error 8 12 -./arith.tests: line 290: syntax error: a b +./arith.tests: line 290: arithmetic syntax error 42 42 42 |