summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2010-09-10 10:19:22 +0200
committerDenys Vlasenko2010-09-10 10:19:22 +0200
commitcc461736d6ca3c3b809390d8d7873a136e3b899a (patch)
tree4e86544756152ffa279ac6d029c083c0a22291b9
parentebee410fe2500d6bd5980032d0b183494f509c9b (diff)
downloadbusybox-cc461736d6ca3c3b809390d8d7873a136e3b899a.zip
busybox-cc461736d6ca3c3b809390d8d7873a136e3b899a.tar.gz
hush: fixes to testsuite
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--[-rwxr-xr-x]shell/hush_test/hush-bugs/export_exp.tests.disabled (renamed from shell/hush_test/hush-bugs/export_exp.tests)3
-rwxr-xr-xshell/hush_test/hush-trap/subshell.tests11
2 files changed, 8 insertions, 6 deletions
diff --git a/shell/hush_test/hush-bugs/export_exp.tests b/shell/hush_test/hush-bugs/export_exp.tests.disabled
index 91f57aa..0913fd3 100755..100644
--- a/shell/hush_test/hush-bugs/export_exp.tests
+++ b/shell/hush_test/hush-bugs/export_exp.tests.disabled
@@ -1,3 +1,6 @@
+# This test shows a very special handling of export and local
+# builtins by bash.
+
v="a=aa0 b=bb0"
# only 1st arg should be expanded in multiple words
export $v c=$v
diff --git a/shell/hush_test/hush-trap/subshell.tests b/shell/hush_test/hush-trap/subshell.tests
index 045294b..d877f2b 100755
--- a/shell/hush_test/hush-trap/subshell.tests
+++ b/shell/hush_test/hush-trap/subshell.tests
@@ -11,10 +11,9 @@ trap 'bad: caught WINCH' WINCH
# With TERM we'll check whether it is reset
trap 'bad: caught TERM' TERM
-# using bash, because we don't have $PPID (yet)
-(trap; bash -c 'kill -HUP $PPID'; echo Ok)
-(trap; bash -c 'kill -QUIT $PPID'; echo Ok)
-(trap; bash -c 'kill -SYS $PPID'; echo Ok)
-(trap; bash -c 'kill -WINCH $PPID'; echo Ok)
-(trap; bash -c 'kill -TERM $PPID'; echo Bad: TERM is not reset)
+(trap; "$THIS_SH" -c 'kill -HUP $PPID'; echo Ok)
+(trap; "$THIS_SH" -c 'kill -QUIT $PPID'; echo Ok)
+(trap; "$THIS_SH" -c 'kill -SYS $PPID'; echo Ok)
+(trap; "$THIS_SH" -c 'kill -WINCH $PPID'; echo Ok)
+(trap; "$THIS_SH" -c 'kill -TERM $PPID'; echo Bad: TERM is not reset)
echo Done