From cc461736d6ca3c3b809390d8d7873a136e3b899a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 10 Sep 2010 10:19:22 +0200 Subject: [PATCH] hush: fixes to testsuite Signed-off-by: Denys Vlasenko --- .../{export_exp.tests => export_exp.tests.disabled} | 3 +++ shell/hush_test/hush-trap/subshell.tests | 11 +++++------ 2 files changed, 8 insertions(+), 6 deletions(-) rename shell/hush_test/hush-bugs/{export_exp.tests => export_exp.tests.disabled} (80%) mode change 100755 => 100644 diff --git a/shell/hush_test/hush-bugs/export_exp.tests b/shell/hush_test/hush-bugs/export_exp.tests.disabled old mode 100755 new mode 100644 similarity index 80% rename from shell/hush_test/hush-bugs/export_exp.tests rename to shell/hush_test/hush-bugs/export_exp.tests.disabled index 91f57aa2c..0913fd3f2 --- 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 045294bf4..d877f2b82 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