diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-14 13:36:48 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-14 13:36:48 +0200 |
| commit | 9fda609a60506f4c1f73f0034cafd2b3434f4df3 (patch) | |
| tree | d3ea98fe9f47577162a884ec6cd1a6b233e72bc4 /shell/hush_test | |
| parent | 75e90b15482184db83f03c67b53d4220888c6c9d (diff) | |
| download | busybox-w32-9fda609a60506f4c1f73f0034cafd2b3434f4df3.tar.gz busybox-w32-9fda609a60506f4c1f73f0034cafd2b3434f4df3.tar.bz2 busybox-w32-9fda609a60506f4c1f73f0034cafd2b3434f4df3.zip | |
hush: add support for "set -e"
function old new delta
run_list 978 1046 +68
o_opt_strings 24 32 +8
reset_traps_to_defaults 136 142 +6
pick_sighandler 57 60 +3
packed_usage 31772 31770 -2
hush_main 983 961 -22
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/2 up/down: 85/-24) 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/errexit1.right | 1 | ||||
| -rwxr-xr-x | shell/hush_test/hush-misc/errexit1.tests | 5 | ||||
| -rw-r--r-- | shell/hush_test/hush-signals/signal8.right | 3 | ||||
| -rwxr-xr-x | shell/hush_test/hush-signals/signal8.tests | 18 | ||||
| -rw-r--r-- | shell/hush_test/hush-signals/signal9.right | 3 | ||||
| -rwxr-xr-x | shell/hush_test/hush-signals/signal9.tests | 21 |
6 files changed, 51 insertions, 0 deletions
diff --git a/shell/hush_test/hush-misc/errexit1.right b/shell/hush_test/hush-misc/errexit1.right new file mode 100644 index 000000000..d86bac9de --- /dev/null +++ b/shell/hush_test/hush-misc/errexit1.right | |||
| @@ -0,0 +1 @@ | |||
| OK | |||
diff --git a/shell/hush_test/hush-misc/errexit1.tests b/shell/hush_test/hush-misc/errexit1.tests new file mode 100755 index 000000000..7b4a15634 --- /dev/null +++ b/shell/hush_test/hush-misc/errexit1.tests | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | set -e | ||
| 2 | (true) | ||
| 3 | echo OK | ||
| 4 | (false) | ||
| 5 | echo FAIL | ||
diff --git a/shell/hush_test/hush-signals/signal8.right b/shell/hush_test/hush-signals/signal8.right new file mode 100644 index 000000000..39572f30e --- /dev/null +++ b/shell/hush_test/hush-signals/signal8.right | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | Removing traps | ||
| 2 | End of exit_func | ||
| 3 | Done: 0 | ||
diff --git a/shell/hush_test/hush-signals/signal8.tests b/shell/hush_test/hush-signals/signal8.tests new file mode 100755 index 000000000..731af7477 --- /dev/null +++ b/shell/hush_test/hush-signals/signal8.tests | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | "$THIS_SH" -c ' | ||
| 2 | exit_func() { | ||
| 3 | echo "Removing traps" | ||
| 4 | trap - EXIT TERM INT | ||
| 5 | echo "End of exit_func" | ||
| 6 | } | ||
| 7 | set -e | ||
| 8 | trap exit_func EXIT TERM INT | ||
| 9 | sleep 2 | ||
| 10 | exit 77 | ||
| 11 | ' & | ||
| 12 | |||
| 13 | sleep 1 | ||
| 14 | # BUG: ash kills -PGRP, but in non-interactive shell we do not create pgrps! | ||
| 15 | # In this case, bash kills by PID, not PGRP. | ||
| 16 | kill -TERM %1 | ||
| 17 | wait | ||
| 18 | echo Done: $? | ||
diff --git a/shell/hush_test/hush-signals/signal9.right b/shell/hush_test/hush-signals/signal9.right new file mode 100644 index 000000000..39572f30e --- /dev/null +++ b/shell/hush_test/hush-signals/signal9.right | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | Removing traps | ||
| 2 | End of exit_func | ||
| 3 | Done: 0 | ||
diff --git a/shell/hush_test/hush-signals/signal9.tests b/shell/hush_test/hush-signals/signal9.tests new file mode 100755 index 000000000..18e71012b --- /dev/null +++ b/shell/hush_test/hush-signals/signal9.tests | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | # Note: the inner script is a test which checks for a different bug | ||
| 2 | # (ordering between INT handler and exit on "set -e"), | ||
| 3 | # but so far I did not figure out how to simulate it non-interactively. | ||
| 4 | |||
| 5 | "$THIS_SH" -c ' | ||
| 6 | exit_func() { | ||
| 7 | echo "Removing traps" | ||
| 8 | trap - EXIT TERM INT | ||
| 9 | echo "End of exit_func" | ||
| 10 | } | ||
| 11 | set -e | ||
| 12 | trap exit_func EXIT TERM INT | ||
| 13 | sleep 2 | ||
| 14 | exit 77 | ||
| 15 | ' & | ||
| 16 | |||
| 17 | child=$! | ||
| 18 | sleep 1 | ||
| 19 | kill -TERM $child | ||
| 20 | wait | ||
| 21 | echo Done: $? | ||