diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-09-10 10:17:53 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-09-10 10:17:53 +0200 |
commit | ebee410fe2500d6bd5980032d0b183494f509c9b (patch) | |
tree | 7d51a849f343d4b3437714aea40f7efaf6ef4050 /shell/hush_test | |
parent | 14e289b3246b4266499ffc5747dcc5c98bdaf5b9 (diff) | |
download | busybox-w32-ebee410fe2500d6bd5980032d0b183494f509c9b.tar.gz busybox-w32-ebee410fe2500d6bd5980032d0b183494f509c9b.tar.bz2 busybox-w32-ebee410fe2500d6bd5980032d0b183494f509c9b.zip |
hush: fix var_bash5.tests failure
function old new delta
expand_one_var 1513 1552 +39
expand_pseudo_dquoted 118 135 +17
expand_string_to_string 110 126 +16
setup_heredoc 298 308 +10
expand_and_evaluate_arith 69 79 +10
parse_stream_dquoted 233 241 +8
setup_redirects 220 225 +5
run_list 956 961 +5
expand_assignments 76 81 +5
run_pipe 1587 1590 +3
parse_stream 2371 2374 +3
builtin_umask 132 133 +1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 12/0 up/down: 122/0) Total: 122 bytes
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'shell/hush_test')
-rw-r--r-- | shell/hush_test/hush-vars/var_bash5.right | 13 | ||||
-rwxr-xr-x | shell/hush_test/hush-vars/var_bash5.tests | 24 |
2 files changed, 31 insertions, 6 deletions
diff --git a/shell/hush_test/hush-vars/var_bash5.right b/shell/hush_test/hush-vars/var_bash5.right index 278ed3228..1990902b2 100644 --- a/shell/hush_test/hush-vars/var_bash5.right +++ b/shell/hush_test/hush-vars/var_bash5.right | |||
@@ -1,4 +1,11 @@ | |||
1 | a/ | 1 | 1 a/ |
2 | a/d | 2 | 2 a/d |
3 | a/e/f | 3 | 3 a/e/f |
4 | 4 a\ | ||
5 | 5 a\d | ||
6 | 6 a\e\f | ||
7 | 7 a\\ | ||
8 | 8 a\\d | ||
9 | 9 a\\e\\f | ||
10 | a ab | ||
4 | Done: 0 | 11 | Done: 0 |
diff --git a/shell/hush_test/hush-vars/var_bash5.tests b/shell/hush_test/hush-vars/var_bash5.tests index 7f482a554..5748b4ac7 100755 --- a/shell/hush_test/hush-vars/var_bash5.tests +++ b/shell/hush_test/hush-vars/var_bash5.tests | |||
@@ -4,8 +4,26 @@ | |||
4 | v='a/b/c' | 4 | v='a/b/c' |
5 | s='b/c' | 5 | s='b/c' |
6 | r='e/f' | 6 | r='e/f' |
7 | echo "${v/$s}" | 7 | echo "1 ${v/$s}" |
8 | echo "${v/$s/d}" | 8 | echo "2 ${v/$s/d}" |
9 | echo "${v/$s/$r}" | 9 | echo "3 ${v/$s/$r}" |
10 | |||
11 | v='a\b\c' | ||
12 | s='b\\c' | ||
13 | r='e\f' | ||
14 | echo "4 ${v/$s}" | ||
15 | echo "5 ${v/$s/d}" | ||
16 | echo "6 ${v/$s/$r}" | ||
17 | |||
18 | v='a\\b\\c' | ||
19 | s='b\\\\c' | ||
20 | r='e\\f' | ||
21 | echo "7 ${v/$s}" | ||
22 | echo "8 ${v/$s/d}" | ||
23 | echo "9 ${v/$s/$r}" | ||
24 | |||
25 | v='a-$a-\t-\\-\"-\`-\--\z-\*-\?-b' | ||
26 | s='-$a-\\t-\\\\-\\"-\\`-\\--\\z-\\\*-\\\?-' | ||
27 | echo "a ${v/$s}" | ||
10 | 28 | ||
11 | echo Done: $? | 29 | echo Done: $? |