aboutsummaryrefslogtreecommitdiff
path: root/shell/hush_test
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-01-12 15:19:31 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-01-12 15:19:31 +0100
commite89a241b9ed76aed22bde93f58311db9c159cde2 (patch)
tree703fcdf66e1ceb244fcb4b31b9cf5bb66a0c313f /shell/hush_test
parentf3ec0fb1b4ae594c152dd626996f3abdc28b13be (diff)
downloadbusybox-w32-e89a241b9ed76aed22bde93f58311db9c159cde2.tar.gz
busybox-w32-e89a241b9ed76aed22bde93f58311db9c159cde2.tar.bz2
busybox-w32-e89a241b9ed76aed22bde93f58311db9c159cde2.zip
hush: fix subshell.tests failure on NOMMU
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush_test')
-rw-r--r--shell/hush_test/hush-trap/subshell.right15
-rwxr-xr-xshell/hush_test/hush-trap/subshell.tests10
2 files changed, 20 insertions, 5 deletions
diff --git a/shell/hush_test/hush-trap/subshell.right b/shell/hush_test/hush-trap/subshell.right
index 0d20ed4e9..f865b932b 100644
--- a/shell/hush_test/hush-trap/subshell.right
+++ b/shell/hush_test/hush-trap/subshell.right
@@ -1,6 +1,21 @@
1trap -- '' HUP
2trap -- '' QUIT
3trap -- '' SYS
1Ok 4Ok
5trap -- '' HUP
6trap -- '' QUIT
7trap -- '' SYS
2Ok 8Ok
9trap -- '' HUP
10trap -- '' QUIT
11trap -- '' SYS
3Ok 12Ok
13trap -- '' HUP
14trap -- '' QUIT
15trap -- '' SYS
4Ok 16Ok
17trap -- '' HUP
18trap -- '' QUIT
19trap -- '' SYS
5TERM 20TERM
6Done 21Done
diff --git a/shell/hush_test/hush-trap/subshell.tests b/shell/hush_test/hush-trap/subshell.tests
index 4564c2ee2..045294bf4 100755
--- a/shell/hush_test/hush-trap/subshell.tests
+++ b/shell/hush_test/hush-trap/subshell.tests
@@ -12,9 +12,9 @@ trap 'bad: caught WINCH' WINCH
12trap 'bad: caught TERM' TERM 12trap 'bad: caught TERM' TERM
13 13
14# using bash, because we don't have $PPID (yet) 14# using bash, because we don't have $PPID (yet)
15(bash -c 'kill -HUP $PPID'; echo Ok) 15(trap; bash -c 'kill -HUP $PPID'; echo Ok)
16(bash -c 'kill -QUIT $PPID'; echo Ok) 16(trap; bash -c 'kill -QUIT $PPID'; echo Ok)
17(bash -c 'kill -SYS $PPID'; echo Ok) 17(trap; bash -c 'kill -SYS $PPID'; echo Ok)
18(bash -c 'kill -WINCH $PPID'; echo Ok) 18(trap; bash -c 'kill -WINCH $PPID'; echo Ok)
19(bash -c 'kill -TERM $PPID'; echo Bad: TERM is not reset) 19(trap; bash -c 'kill -TERM $PPID'; echo Bad: TERM is not reset)
20echo Done 20echo Done