From e89a241b9ed76aed22bde93f58311db9c159cde2 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 12 Jan 2010 15:19:31 +0100 Subject: hush: fix subshell.tests failure on NOMMU Signed-off-by: Denys Vlasenko --- shell/hush_test/hush-trap/subshell.right | 15 +++++++++++++++ shell/hush_test/hush-trap/subshell.tests | 10 +++++----- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'shell/hush_test/hush-trap') 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 @@ +trap -- '' HUP +trap -- '' QUIT +trap -- '' SYS Ok +trap -- '' HUP +trap -- '' QUIT +trap -- '' SYS Ok +trap -- '' HUP +trap -- '' QUIT +trap -- '' SYS Ok +trap -- '' HUP +trap -- '' QUIT +trap -- '' SYS Ok +trap -- '' HUP +trap -- '' QUIT +trap -- '' SYS TERM Done 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 trap 'bad: caught TERM' TERM # using bash, because we don't have $PPID (yet) -(bash -c 'kill -HUP $PPID'; echo Ok) -(bash -c 'kill -QUIT $PPID'; echo Ok) -(bash -c 'kill -SYS $PPID'; echo Ok) -(bash -c 'kill -WINCH $PPID'; echo Ok) -(bash -c 'kill -TERM $PPID'; echo Bad: TERM is not reset) +(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) echo Done -- cgit v1.2.3