aboutsummaryrefslogtreecommitdiff
path: root/shell/hush_test
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-09-10 10:17:53 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2010-09-10 10:17:53 +0200
commitebee410fe2500d6bd5980032d0b183494f509c9b (patch)
tree7d51a849f343d4b3437714aea40f7efaf6ef4050 /shell/hush_test
parent14e289b3246b4266499ffc5747dcc5c98bdaf5b9 (diff)
downloadbusybox-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.right13
-rwxr-xr-xshell/hush_test/hush-vars/var_bash5.tests24
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 @@
1a/ 11 a/
2a/d 22 a/d
3a/e/f 33 a/e/f
44 a\
55 a\d
66 a\e\f
77 a\\
88 a\\d
99 a\\e\\f
10a ab
4Done: 0 11Done: 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 @@
4v='a/b/c' 4v='a/b/c'
5s='b/c' 5s='b/c'
6r='e/f' 6r='e/f'
7echo "${v/$s}" 7echo "1 ${v/$s}"
8echo "${v/$s/d}" 8echo "2 ${v/$s/d}"
9echo "${v/$s/$r}" 9echo "3 ${v/$s/$r}"
10
11v='a\b\c'
12s='b\\c'
13r='e\f'
14echo "4 ${v/$s}"
15echo "5 ${v/$s/d}"
16echo "6 ${v/$s/$r}"
17
18v='a\\b\\c'
19s='b\\\\c'
20r='e\\f'
21echo "7 ${v/$s}"
22echo "8 ${v/$s/d}"
23echo "9 ${v/$s/$r}"
24
25v='a-$a-\t-\\-\"-\`-\--\z-\*-\?-b'
26s='-$a-\\t-\\\\-\\"-\\`-\\--\\z-\\\*-\\\?-'
27echo "a ${v/$s}"
10 28
11echo Done: $? 29echo Done: $?