d30810624
Denis Vlasenko
2009-03-31
Subject
hust_test/*: use "$THIS_SH" instead of hush
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/hush_test/hush-trap/catch.tests +1 -1shell/hush_test/hush-trap/exit.tests +3 -3shell/hush_test/hush-vars/param_expand_alt.tests +2 -2shell/hush_test/hush-vars/param_expand_assign.tests +12 -12shell/hush_test/hush-vars/param_expand_default.tests +2 -2shell/hush_test/hush-vars/param_expand_indicate_error.tests +29 -29shell/hush_test/hush-vars/var3.tests +3 -3
shell/hush_test/hush-trap/catch.tests+1 -1
| @@ -1,7 +1,7 @@ | |
| # avoid ugly warnings about signals not being caught | |
| trap ":" USR1 USR2 | |
| - | hush -c ' |
| + | "$THIS_SH" -c ' |
| trap "echo caught" USR2 | |
| echo "sending USR2" | |
| kill -USR2 $$ | |
shell/hush_test/hush-trap/exit.tests+3 -3
| @@ -1,3 +1,3 @@ | |
| - | hush -c 'trap "echo cow" 0' |
| - | hush -c 'trap "echo moo" EXIT' |
| - | hush -c 'trap "echo no" 0; trap 0' |
| + | "$THIS_SH" -c 'trap "echo cow" 0' |
| + | "$THIS_SH" -c 'trap "echo moo" EXIT' |
| + | "$THIS_SH" -c 'trap "echo no" 0; trap 0' |
shell/hush_test/hush-vars/param_expand_alt.tests+2 -2
| @@ -1,6 +1,6 @@ | |
| # first try some invalid patterns (do in subshell due to parsing error) | |
| - | hush -c 'echo ${+} ; echo moo' |
| - | hush -c 'echo ${:+} ; echo moo' |
| + | "$THIS_SH" -c 'echo ${+} ; echo moo' |
| + | "$THIS_SH" -c 'echo ${:+} ; echo moo' |
| # now some funky ones | |
| echo _${#+} _${#:+} | |
shell/hush_test/hush-vars/param_expand_assign.tests+12 -12
| @@ -1,22 +1,22 @@ | |
| # first try some invalid patterns (do in subshell due to parsing error) | |
| - | hush -c 'echo ${=}' |
| - | hush -c 'echo ${:=}' |
| + | "$THIS_SH" -c 'echo ${=}' |
| + | "$THIS_SH" -c 'echo ${:=}' |
| # now some funky ones | |
| - | hush -c 'echo ${#=}' |
| - | hush -c 'echo ${#:=}' |
| + | "$THIS_SH" -c 'echo ${#=}' |
| + | "$THIS_SH" -c 'echo ${#:=}' |
| # should error out | |
| - | hush -c 'set --; echo _${1=}' |
| - | hush -c 'set --; echo _${1:=}' |
| - | hush -c 'set --; echo _${1=word}' |
| - | hush -c 'set --; echo _${1:=word}' |
| + | "$THIS_SH" -c 'set --; echo _${1=}' |
| + | "$THIS_SH" -c 'set --; echo _${1:=}' |
| + | "$THIS_SH" -c 'set --; echo _${1=word}' |
| + | "$THIS_SH" -c 'set --; echo _${1:=word}' |
| # should not error | |
| - | hush -c 'set aa; echo _${1=}' |
| - | hush -c 'set aa; echo _${1:=}' |
| - | hush -c 'set aa; echo _${1=word}' |
| - | hush -c 'set aa; echo _${1:=word}' |
| + | "$THIS_SH" -c 'set aa; echo _${1=}' |
| + | "$THIS_SH" -c 'set aa; echo _${1:=}' |
| + | "$THIS_SH" -c 'set aa; echo _${1=word}' |
| + | "$THIS_SH" -c 'set aa; echo _${1:=word}' |
| # should work fine | |
| unset f; echo _$f | |
shell/hush_test/hush-vars/param_expand_default.tests+2 -2
| @@ -1,6 +1,6 @@ | |
| # first try some invalid patterns (do in subshell due to parsing error) | |
| - | hush -c 'echo ${-}' |
| - | hush -c 'echo ${:-}' |
| + | "$THIS_SH" -c 'echo ${-}' |
| + | "$THIS_SH" -c 'echo ${:-}' |
| # now some funky ones | |
| echo _${#-} _${#:-} | |
shell/hush_test/hush-vars/param_expand_indicate_error.tests+29 -29
| @@ -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 ${?}' |
| - | hush -c 'echo ${:?}' |
| + | "$THIS_SH" -c 'echo ${?}' |
| + | "$THIS_SH" -c 'echo ${:?}' |
| # then some funky ones | |
| - | hush -c 'echo ${#?}' |
| - | hush -c 'echo ${#:?}' |
| + | "$THIS_SH" -c 'echo ${#?}' |
| + | "$THIS_SH" -c 'echo ${#:?}' |
| # now some valid ones | |
| - | hush -c 'set --; echo _$1' |
| - | hush -c 'set --; echo _${1?}' |
| - | hush -c 'set --; echo _${1:?}' |
| - | hush -c 'set --; echo _${1?word}' |
| - | hush -c 'set --; echo _${1:?word}' |
| + | "$THIS_SH" -c 'set --; echo _$1' |
| + | "$THIS_SH" -c 'set --; echo _${1?}' |
| + | "$THIS_SH" -c 'set --; echo _${1:?}' |
| + | "$THIS_SH" -c 'set --; echo _${1?word}' |
| + | "$THIS_SH" -c 'set --; echo _${1:?word}' |
| - | hush -c 'set -- aaaa; echo _$1' |
| - | hush -c 'set -- aaaa; echo _${1?}' |
| - | hush -c 'set -- aaaa; echo _${1:?}' |
| - | hush -c 'set -- aaaa; echo _${1?word}' |
| - | hush -c 'set -- aaaa; echo _${1:?word}' |
| + | "$THIS_SH" -c 'set -- aaaa; echo _$1' |
| + | "$THIS_SH" -c 'set -- aaaa; echo _${1?}' |
| + | "$THIS_SH" -c 'set -- aaaa; echo _${1:?}' |
| + | "$THIS_SH" -c 'set -- aaaa; echo _${1?word}' |
| + | "$THIS_SH" -c 'set -- aaaa; echo _${1:?word}' |
| - | hush -c 'unset f; echo _$f' |
| - | hush -c 'unset f; echo _${f?}' |
| - | hush -c 'unset f; echo _${f:?}' |
| - | hush -c 'unset f; echo _${f?word}' |
| - | hush -c 'unset f; echo _${f:?word}' |
| + | "$THIS_SH" -c 'unset f; echo _$f' |
| + | "$THIS_SH" -c 'unset f; echo _${f?}' |
| + | "$THIS_SH" -c 'unset f; echo _${f:?}' |
| + | "$THIS_SH" -c 'unset f; echo _${f?word}' |
| + | "$THIS_SH" -c 'unset f; echo _${f:?word}' |
| - | hush -c 'f=; echo _$f' |
| - | hush -c 'f=; echo _${f?}' |
| - | hush -c 'f=; echo _${f:?}' |
| - | hush -c 'f=; echo _${f?word}' |
| - | hush -c 'f=; echo _${f:?word}' |
| + | "$THIS_SH" -c 'f=; echo _$f' |
| + | "$THIS_SH" -c 'f=; echo _${f?}' |
| + | "$THIS_SH" -c 'f=; echo _${f:?}' |
| + | "$THIS_SH" -c 'f=; echo _${f?word}' |
| + | "$THIS_SH" -c 'f=; echo _${f:?word}' |
| - | hush -c 'f=fff; echo _$f' |
| - | hush -c 'f=fff; echo _${f?}' |
| - | hush -c 'f=fff; echo _${f:?}' |
| - | hush -c 'f=fff; echo _${f?word}' |
| - | hush -c 'f=fff; echo _${f:?word}' |
| + | "$THIS_SH" -c 'f=fff; echo _$f' |
| + | "$THIS_SH" -c 'f=fff; echo _${f?}' |
| + | "$THIS_SH" -c 'f=fff; echo _${f:?}' |
| + | "$THIS_SH" -c 'f=fff; echo _${f?word}' |
| + | "$THIS_SH" -c 'f=fff; echo _${f:?word}' |
shell/hush_test/hush-vars/var3.tests+3 -3
| @@ -1,4 +1,4 @@ | |
| # reject invalid vars | |
| - | hush -c 'echo ${1q}' |
| - | hush -c 'echo ${&}' |
| - | hush -c 'echo ${$}' |
| + | "$THIS_SH" -c 'echo ${1q}' |
| + | "$THIS_SH" -c 'echo ${&}' |
| + | "$THIS_SH" -c 'echo ${$}' |