From a110c90de2f56bf38de30972813f012d44042cb9 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 12 Sep 2010 15:38:04 +0200 Subject: hush: fix EXIT trap display inside exit trap handler function old new delta hush_exit 84 78 -6 Signed-off-by: Denys Vlasenko --- shell/hush_test/hush-trap/exit.right | 10 ++++++++++ shell/hush_test/hush-trap/exit.tests | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) (limited to 'shell/hush_test/hush-trap') diff --git a/shell/hush_test/hush-trap/exit.right b/shell/hush_test/hush-trap/exit.right index b4932fb7f..3d0072564 100644 --- a/shell/hush_test/hush-trap/exit.right +++ b/shell/hush_test/hush-trap/exit.right @@ -1,2 +1,12 @@ cow moo +Traps1: +trap -- 'exitfunc' EXIT +Traps2: +trap -- 'echo Should not run' EXIT +Check1: 42 +Traps1: +trap -- 'exitfunc' EXIT +Traps2: +trap -- 'echo Should not run' EXIT +Check2: 42 diff --git a/shell/hush_test/hush-trap/exit.tests b/shell/hush_test/hush-trap/exit.tests index 092543c25..2061105dd 100755 --- a/shell/hush_test/hush-trap/exit.tests +++ b/shell/hush_test/hush-trap/exit.tests @@ -1,3 +1,34 @@ "$THIS_SH" -c 'trap "echo cow" 0' "$THIS_SH" -c 'trap "echo moo" EXIT' "$THIS_SH" -c 'trap "echo no" 0; trap 0' + +( +exitfunc() { + echo "Traps1:" + trap + # EXIT trap is disabled after it is triggered, + # it can not be "re-armed" like this: + trap "echo Should not run" EXIT + echo "Traps2:" + trap +} +trap 'exitfunc' EXIT +exit 42 +) +echo Check1: $? + +( +exitfunc() { + echo "Traps1:" + trap + # EXIT trap is disabled after it is triggered, + # it can not be "re-armed" like this: + trap "echo Should not run" EXIT + echo "Traps2:" + trap + exit 42 +} +trap 'exitfunc' EXIT +exit 66 +) +echo Check2: $? -- cgit v1.2.3