diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-02-20 16:37:59 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-02-20 16:37:59 +0100 |
| commit | bb095f483827567452ee3501779a84f36719288d (patch) | |
| tree | 26e844ece54913569de12bc0ae76cc77ffcfdf77 /shell/hush_test | |
| parent | d5bfe26c457a97a8b525b6c27f5498525a5829bf (diff) | |
| download | busybox-bb095f483827567452ee3501779a84f36719288d.tar.gz | |
hush: implement "return NUM in trap sets $? after trap"
function old new delta
builtin_return 47 67 +20
check_and_run_traps 243 259 +16
run_pipe 1583 1597 +14
hush_main 1076 1086 +10
run_list 1054 1055 +1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/0 up/down: 61/0) Total: 61 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush_test')
| -rw-r--r-- | shell/hush_test/hush-misc/exitcode_trap3.right | 2 | ||||
| -rwxr-xr-x | shell/hush_test/hush-misc/exitcode_trap3.tests | 9 | ||||
| -rw-r--r-- | shell/hush_test/hush-misc/exitcode_trap4.right | 2 | ||||
| -rwxr-xr-x | shell/hush_test/hush-misc/exitcode_trap4.tests | 8 | ||||
| -rw-r--r-- | shell/hush_test/hush-misc/exitcode_trap5.right | 3 | ||||
| -rwxr-xr-x | shell/hush_test/hush-misc/exitcode_trap5.tests | 10 |
6 files changed, 34 insertions, 0 deletions
diff --git a/shell/hush_test/hush-misc/exitcode_trap3.right b/shell/hush_test/hush-misc/exitcode_trap3.right new file mode 100644 index 000000000..f275cdc45 --- /dev/null +++ b/shell/hush_test/hush-misc/exitcode_trap3.right @@ -0,0 +1,2 @@ +TERM +42:42 diff --git a/shell/hush_test/hush-misc/exitcode_trap3.tests b/shell/hush_test/hush-misc/exitcode_trap3.tests new file mode 100755 index 000000000..98745e463 --- /dev/null +++ b/shell/hush_test/hush-misc/exitcode_trap3.tests @@ -0,0 +1,9 @@ +# "return" in trap should not use last command's exitcode, +# but exitcode on entering the trap. +trap "echo TERM;return" term +f() { + (sleep 1; kill $$) & + until (exit 42) do (exit 42); done +} +f +echo 42:$? diff --git a/shell/hush_test/hush-misc/exitcode_trap4.right b/shell/hush_test/hush-misc/exitcode_trap4.right new file mode 100644 index 000000000..ed6989593 --- /dev/null +++ b/shell/hush_test/hush-misc/exitcode_trap4.right @@ -0,0 +1,2 @@ +TERM +11:11 diff --git a/shell/hush_test/hush-misc/exitcode_trap4.tests b/shell/hush_test/hush-misc/exitcode_trap4.tests new file mode 100755 index 000000000..36dba90bd --- /dev/null +++ b/shell/hush_test/hush-misc/exitcode_trap4.tests @@ -0,0 +1,8 @@ +# "return" in trap sets $? after trap +trap "echo TERM;return 11" term +f() { + (sleep 1; kill $$) & + until (exit 42) do (exit 42); done +} +f +echo 11:$? diff --git a/shell/hush_test/hush-misc/exitcode_trap5.right b/shell/hush_test/hush-misc/exitcode_trap5.right new file mode 100644 index 000000000..1ad4443b4 --- /dev/null +++ b/shell/hush_test/hush-misc/exitcode_trap5.right @@ -0,0 +1,3 @@ +TERM +Nested +Zero:0 diff --git a/shell/hush_test/hush-misc/exitcode_trap5.tests b/shell/hush_test/hush-misc/exitcode_trap5.tests new file mode 100755 index 000000000..332a06463 --- /dev/null +++ b/shell/hush_test/hush-misc/exitcode_trap5.tests @@ -0,0 +1,10 @@ +# "return" in trap sets $? after trap... +# ...but not a nested one! +g() { echo Nested; return 22; } +trap "echo TERM;false;g" term +f() { + (kill $$) & + sleep 1 +} +f +echo Zero:$? |