hust_test/*: use "$THIS_SH" instead of hush

author: Denis Vlasenko <vda.linux@googlemail.com> 2009-03-31 22:14:32 +0000
committer: Denis Vlasenko <vda.linux@googlemail.com> 2009-03-31 22:14:32 +0000
commit: d3081062453cb394052dd2d8ecda94aaaff3c6df (patch)
tree: 374ee8629cea1a035e13ed8c05e1ef4ee46fb9ee /shell/hush_test/hush-vars
parent: 9983d806d910ef1e01bc1868ded40720cee3f092 (diff)
download: busybox-w32-d3081062453cb394052dd2d8ecda94aaaff3c6df.tar.gz
busybox-w32-d3081062453cb394052dd2d8ecda94aaaff3c6df.tar.bz2
busybox-w32-d3081062453cb394052dd2d8ecda94aaaff3c6df.zip
5 files changed, 48 insertions, 48 deletions
diff --git a/shell/hush_test/hush-vars/param_expand_alt.tests b/shell/hush_test/hush-vars/param_expand_alt.tests
index c46075b8d..dcdca86d4 100755
--- a/shell/hush_test/hush-vars/param_expand_alt.tests
+++ b/shell/hush_test/hush-vars/param_expand_alt.tests
@@ -1,6 +1,6 @@
 # first try some invalid patterns (do in subshell due to parsing error)
-hush -c 'echo ${+}  ; echo moo'
+"$THIS_SH" -c 'echo ${+}  ; echo moo'
-hush -c 'echo ${:+} ; echo moo'
+"$THIS_SH" -c 'echo ${:+} ; echo moo'
 # now some funky ones
 echo _${#+} _${#:+}
diff --git a/shell/hush_test/hush-vars/param_expand_assign.tests b/shell/hush_test/hush-vars/param_expand_assign.tests
index 1fba556e4..149cb20df 100755
--- a/shell/hush_test/hush-vars/param_expand_assign.tests
+++ b/shell/hush_test/hush-vars/param_expand_assign.tests
@@ -1,22 +1,22 @@
 # first try some invalid patterns (do in subshell due to parsing error)
-hush -c 'echo ${=}'
+"$THIS_SH" -c 'echo ${=}'
-hush -c 'echo ${:=}'
+"$THIS_SH" -c 'echo ${:=}'
 # now some funky ones
-hush -c 'echo ${#=}'
+"$THIS_SH" -c 'echo ${#=}'
-hush -c 'echo ${#:=}'
+"$THIS_SH" -c 'echo ${#:=}'
 # should error out
-hush -c 'set --; echo _${1=}'
+"$THIS_SH" -c 'set --; echo _${1=}'
-hush -c 'set --; echo _${1:=}'
+"$THIS_SH" -c 'set --; echo _${1:=}'
-hush -c 'set --; echo _${1=word}'
+"$THIS_SH" -c 'set --; echo _${1=word}'
-hush -c 'set --; echo _${1:=word}'
+"$THIS_SH" -c 'set --; echo _${1:=word}'
 # should not error
-hush -c 'set aa; echo _${1=}'
+"$THIS_SH" -c 'set aa; echo _${1=}'
-hush -c 'set aa; echo _${1:=}'
+"$THIS_SH" -c 'set aa; echo _${1:=}'
-hush -c 'set aa; echo _${1=word}'
+"$THIS_SH" -c 'set aa; echo _${1=word}'
-hush -c 'set aa; echo _${1:=word}'
+"$THIS_SH" -c 'set aa; echo _${1:=word}'
 # should work fine
 unset f; echo _$f
diff --git a/shell/hush_test/hush-vars/param_expand_default.tests b/shell/hush_test/hush-vars/param_expand_default.tests
index 2320ece42..1ea051748 100755
--- a/shell/hush_test/hush-vars/param_expand_default.tests
+++ b/shell/hush_test/hush-vars/param_expand_default.tests
@@ -1,6 +1,6 @@
 # first try some invalid patterns (do in subshell due to parsing error)
-hush -c 'echo ${-}'
+"$THIS_SH" -c 'echo ${-}'
-hush -c 'echo ${:-}'
+"$THIS_SH" -c 'echo ${:-}'
 # now some funky ones
 echo _${#-} _${#:-}
diff --git a/shell/hush_test/hush-vars/param_expand_indicate_error.tests b/shell/hush_test/hush-vars/param_expand_indicate_error.tests
index 6b431d311..77834fedd 100755
--- a/shell/hush_test/hush-vars/param_expand_indicate_error.tests
+++ b/shell/hush_test/hush-vars/param_expand_indicate_error.tests
@@ -1,40 +1,40 @@
 # do all of these in subshells since it's supposed to error out
 # first try some invalid patterns
-hush -c 'echo ${?}'
+"$THIS_SH" -c 'echo ${?}'
-hush -c 'echo ${:?}'
+"$THIS_SH" -c 'echo ${:?}'
 # then some funky ones
-hush -c 'echo ${#?}'
+"$THIS_SH" -c 'echo ${#?}'
-hush -c 'echo ${#:?}'
+"$THIS_SH" -c 'echo ${#:?}'
 # now some valid ones
-hush -c 'set --; echo _$1'
+"$THIS_SH" -c 'set --; echo _$1'
-hush -c 'set --; echo _${1?}'
+"$THIS_SH" -c 'set --; echo _${1?}'
-hush -c 'set --; echo _${1:?}'
+"$THIS_SH" -c 'set --; echo _${1:?}'
-hush -c 'set --; echo _${1?word}'
+"$THIS_SH" -c 'set --; echo _${1?word}'
-hush -c 'set --; echo _${1:?word}'
+"$THIS_SH" -c 'set --; echo _${1:?word}'
-hush -c 'set -- aaaa; echo _$1'
+"$THIS_SH" -c 'set -- aaaa; echo _$1'
-hush -c 'set -- aaaa; echo _${1?}'
+"$THIS_SH" -c 'set -- aaaa; echo _${1?}'
-hush -c 'set -- aaaa; echo _${1:?}'
+"$THIS_SH" -c 'set -- aaaa; echo _${1:?}'
-hush -c 'set -- aaaa; echo _${1?word}'
+"$THIS_SH" -c 'set -- aaaa; echo _${1?word}'
-hush -c 'set -- aaaa; echo _${1:?word}'
+"$THIS_SH" -c 'set -- aaaa; echo _${1:?word}'
-hush -c 'unset f; echo _$f'
+"$THIS_SH" -c 'unset f; echo _$f'
-hush -c 'unset f; echo _${f?}'
+"$THIS_SH" -c 'unset f; echo _${f?}'
-hush -c 'unset f; echo _${f:?}'
+"$THIS_SH" -c 'unset f; echo _${f:?}'
-hush -c 'unset f; echo _${f?word}'
+"$THIS_SH" -c 'unset f; echo _${f?word}'
-hush -c 'unset f; echo _${f:?word}'
+"$THIS_SH" -c 'unset f; echo _${f:?word}'
-hush -c 'f=; echo _$f'
+"$THIS_SH" -c 'f=; echo _$f'
-hush -c 'f=; echo _${f?}'
+"$THIS_SH" -c 'f=; echo _${f?}'
-hush -c 'f=; echo _${f:?}'
+"$THIS_SH" -c 'f=; echo _${f:?}'
-hush -c 'f=; echo _${f?word}'
+"$THIS_SH" -c 'f=; echo _${f?word}'
-hush -c 'f=; echo _${f:?word}'
+"$THIS_SH" -c 'f=; echo _${f:?word}'
-hush -c 'f=fff; echo _$f'
+"$THIS_SH" -c 'f=fff; echo _$f'
-hush -c 'f=fff; echo _${f?}'
+"$THIS_SH" -c 'f=fff; echo _${f?}'
-hush -c 'f=fff; echo _${f:?}'
+"$THIS_SH" -c 'f=fff; echo _${f:?}'
-hush -c 'f=fff; echo _${f?word}'
+"$THIS_SH" -c 'f=fff; echo _${f?word}'
-hush -c 'f=fff; echo _${f:?word}'
+"$THIS_SH" -c 'f=fff; echo _${f:?word}'
diff --git a/shell/hush_test/hush-vars/var3.tests b/shell/hush_test/hush-vars/var3.tests
index 2947fccee..e09f43317 100755
--- a/shell/hush_test/hush-vars/var3.tests
+++ b/shell/hush_test/hush-vars/var3.tests
@@ -1,4 +1,4 @@
 # reject invalid vars
-hush -c 'echo ${1q}'
+"$THIS_SH" -c 'echo ${1q}'
-hush -c 'echo ${&}'
+"$THIS_SH" -c 'echo ${&}'
-hush -c 'echo ${$}'
+"$THIS_SH" -c 'echo ${$}'
author	Denis Vlasenko <vda.linux@googlemail.com>	2009-03-31 22:14:32 +0000
committer	Denis Vlasenko <vda.linux@googlemail.com>	2009-03-31 22:14:32 +0000
commit	d3081062453cb394052dd2d8ecda94aaaff3c6df (patch)
tree	374ee8629cea1a035e13ed8c05e1ef4ee46fb9ee /shell/hush_test/hush-vars
parent	9983d806d910ef1e01bc1868ded40720cee3f092 (diff)
download	busybox-w32-d3081062453cb394052dd2d8ecda94aaaff3c6df.tar.gz busybox-w32-d3081062453cb394052dd2d8ecda94aaaff3c6df.tar.bz2 busybox-w32-d3081062453cb394052dd2d8ecda94aaaff3c6df.zip

diff --git a/shell/hush_test/hush-vars/param_expand_alt.tests b/shell/hush_test/hush-vars/param_expand_alt.tests index c46075b8d..dcdca86d4 100755 --- a/shell/hush_test/hush-vars/param_expand_alt.tests +++ b/shell/hush_test/hush-vars/param_expand_alt.tests
@@ -1,6 +1,6 @@
1	# first try some invalid patterns (do in subshell due to parsing error)	1	# first try some invalid patterns (do in subshell due to parsing error)
2	hush -c 'echo ${+} ; echo moo'	2	"$THIS_SH" -c 'echo ${+} ; echo moo'
3	hush -c 'echo ${:+} ; echo moo'	3	"$THIS_SH" -c 'echo ${:+} ; echo moo'
4		4
5	# now some funky ones	5	# now some funky ones
6	echo _${#+} _${#:+}	6	echo _${#+} _${#:+}


diff --git a/shell/hush_test/hush-vars/param_expand_assign.tests b/shell/hush_test/hush-vars/param_expand_assign.tests index 1fba556e4..149cb20df 100755 --- a/shell/hush_test/hush-vars/param_expand_assign.tests +++ b/shell/hush_test/hush-vars/param_expand_assign.tests
@@ -1,22 +1,22 @@
1	# first try some invalid patterns (do in subshell due to parsing error)	1	# first try some invalid patterns (do in subshell due to parsing error)
2	hush -c 'echo ${=}'	2	"$THIS_SH" -c 'echo ${=}'
3	hush -c 'echo ${:=}'	3	"$THIS_SH" -c 'echo ${:=}'
4		4
5	# now some funky ones	5	# now some funky ones
6	hush -c 'echo ${#=}'	6	"$THIS_SH" -c 'echo ${#=}'
7	hush -c 'echo ${#:=}'	7	"$THIS_SH" -c 'echo ${#:=}'
8		8
9	# should error out	9	# should error out
10	hush -c 'set --; echo _${1=}'	10	"$THIS_SH" -c 'set --; echo _${1=}'
11	hush -c 'set --; echo _${1:=}'	11	"$THIS_SH" -c 'set --; echo _${1:=}'
12	hush -c 'set --; echo _${1=word}'	12	"$THIS_SH" -c 'set --; echo _${1=word}'
13	hush -c 'set --; echo _${1:=word}'	13	"$THIS_SH" -c 'set --; echo _${1:=word}'
14		14
15	# should not error	15	# should not error
16	hush -c 'set aa; echo _${1=}'	16	"$THIS_SH" -c 'set aa; echo _${1=}'
17	hush -c 'set aa; echo _${1:=}'	17	"$THIS_SH" -c 'set aa; echo _${1:=}'
18	hush -c 'set aa; echo _${1=word}'	18	"$THIS_SH" -c 'set aa; echo _${1=word}'
19	hush -c 'set aa; echo _${1:=word}'	19	"$THIS_SH" -c 'set aa; echo _${1:=word}'
20		20
21	# should work fine	21	# should work fine
22	unset f; echo _$f	22	unset f; echo _$f


diff --git a/shell/hush_test/hush-vars/param_expand_default.tests b/shell/hush_test/hush-vars/param_expand_default.tests index 2320ece42..1ea051748 100755 --- a/shell/hush_test/hush-vars/param_expand_default.tests +++ b/shell/hush_test/hush-vars/param_expand_default.tests
@@ -1,6 +1,6 @@
1	# first try some invalid patterns (do in subshell due to parsing error)	1	# first try some invalid patterns (do in subshell due to parsing error)
2	hush -c 'echo ${-}'	2	"$THIS_SH" -c 'echo ${-}'
3	hush -c 'echo ${:-}'	3	"$THIS_SH" -c 'echo ${:-}'
4		4
5	# now some funky ones	5	# now some funky ones
6	echo _${#-} _${#:-}	6	echo _${#-} _${#:-}


diff --git a/shell/hush_test/hush-vars/param_expand_indicate_error.tests b/shell/hush_test/hush-vars/param_expand_indicate_error.tests index 6b431d311..77834fedd 100755 --- a/shell/hush_test/hush-vars/param_expand_indicate_error.tests +++ b/shell/hush_test/hush-vars/param_expand_indicate_error.tests
@@ -1,40 +1,40 @@
1	# do all of these in subshells since it's supposed to error out	1	# do all of these in subshells since it's supposed to error out
2		2
3	# first try some invalid patterns	3	# first try some invalid patterns
4	hush -c 'echo ${?}'	4	"$THIS_SH" -c 'echo ${?}'
5	hush -c 'echo ${:?}'	5	"$THIS_SH" -c 'echo ${:?}'
6		6
7	# then some funky ones	7	# then some funky ones
8	hush -c 'echo ${#?}'	8	"$THIS_SH" -c 'echo ${#?}'
9	hush -c 'echo ${#:?}'	9	"$THIS_SH" -c 'echo ${#:?}'
10		10
11	# now some valid ones	11	# now some valid ones
12	hush -c 'set --; echo _$1'	12	"$THIS_SH" -c 'set --; echo _$1'
13	hush -c 'set --; echo _${1?}'	13	"$THIS_SH" -c 'set --; echo _${1?}'
14	hush -c 'set --; echo _${1:?}'	14	"$THIS_SH" -c 'set --; echo _${1:?}'
15	hush -c 'set --; echo _${1?word}'	15	"$THIS_SH" -c 'set --; echo _${1?word}'
16	hush -c 'set --; echo _${1:?word}'	16	"$THIS_SH" -c 'set --; echo _${1:?word}'
17		17
18	hush -c 'set -- aaaa; echo _$1'	18	"$THIS_SH" -c 'set -- aaaa; echo _$1'
19	hush -c 'set -- aaaa; echo _${1?}'	19	"$THIS_SH" -c 'set -- aaaa; echo _${1?}'
20	hush -c 'set -- aaaa; echo _${1:?}'	20	"$THIS_SH" -c 'set -- aaaa; echo _${1:?}'
21	hush -c 'set -- aaaa; echo _${1?word}'	21	"$THIS_SH" -c 'set -- aaaa; echo _${1?word}'
22	hush -c 'set -- aaaa; echo _${1:?word}'	22	"$THIS_SH" -c 'set -- aaaa; echo _${1:?word}'
23		23
24	hush -c 'unset f; echo _$f'	24	"$THIS_SH" -c 'unset f; echo _$f'
25	hush -c 'unset f; echo _${f?}'	25	"$THIS_SH" -c 'unset f; echo _${f?}'
26	hush -c 'unset f; echo _${f:?}'	26	"$THIS_SH" -c 'unset f; echo _${f:?}'
27	hush -c 'unset f; echo _${f?word}'	27	"$THIS_SH" -c 'unset f; echo _${f?word}'
28	hush -c 'unset f; echo _${f:?word}'	28	"$THIS_SH" -c 'unset f; echo _${f:?word}'
29		29
30	hush -c 'f=; echo _$f'	30	"$THIS_SH" -c 'f=; echo _$f'
31	hush -c 'f=; echo _${f?}'	31	"$THIS_SH" -c 'f=; echo _${f?}'
32	hush -c 'f=; echo _${f:?}'	32	"$THIS_SH" -c 'f=; echo _${f:?}'
33	hush -c 'f=; echo _${f?word}'	33	"$THIS_SH" -c 'f=; echo _${f?word}'
34	hush -c 'f=; echo _${f:?word}'	34	"$THIS_SH" -c 'f=; echo _${f:?word}'
35		35
36	hush -c 'f=fff; echo _$f'	36	"$THIS_SH" -c 'f=fff; echo _$f'
37	hush -c 'f=fff; echo _${f?}'	37	"$THIS_SH" -c 'f=fff; echo _${f?}'
38	hush -c 'f=fff; echo _${f:?}'	38	"$THIS_SH" -c 'f=fff; echo _${f:?}'
39	hush -c 'f=fff; echo _${f?word}'	39	"$THIS_SH" -c 'f=fff; echo _${f?word}'
40	hush -c 'f=fff; echo _${f:?word}'	40	"$THIS_SH" -c 'f=fff; echo _${f:?word}'


diff --git a/shell/hush_test/hush-vars/var3.tests b/shell/hush_test/hush-vars/var3.tests index 2947fccee..e09f43317 100755 --- a/shell/hush_test/hush-vars/var3.tests +++ b/shell/hush_test/hush-vars/var3.tests
@@ -1,4 +1,4 @@
1	# reject invalid vars	1	# reject invalid vars
2	hush -c 'echo ${1q}'	2	"$THIS_SH" -c 'echo ${1q}'
3	hush -c 'echo ${&}'	3	"$THIS_SH" -c 'echo ${&}'
4	hush -c 'echo ${$}'	4	"$THIS_SH" -c 'echo ${$}'