aboutsummaryrefslogtreecommitdiff
path: root/shell/ash_test/ash-signals
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-09-25 17:15:13 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-09-25 17:15:13 +0200
commitb563f62bbb1c9a6d931924f8fd7c3e52bb3d5875 (patch)
tree617e5a8de03257f9695fd10a496601c607f6803d /shell/ash_test/ash-signals
parent5b3151c201f4a67e998ec054d653e8177679d505 (diff)
downloadbusybox-b563f62bbb1c9a6d931924f8fd7c3e52bb3d5875.tar.gz
ash: fix signal and "set -e" interaction
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/ash_test/ash-signals')
-rw-r--r--shell/ash_test/ash-signals/signal8.right3
-rwxr-xr-xshell/ash_test/ash-signals/signal8.tests18
-rw-r--r--shell/ash_test/ash-signals/signal9.right3
-rwxr-xr-xshell/ash_test/ash-signals/signal9.tests21
4 files changed, 45 insertions, 0 deletions
diff --git a/shell/ash_test/ash-signals/signal8.right b/shell/ash_test/ash-signals/signal8.right
new file mode 100644
index 000000000..39572f30e
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal8.right
@@ -0,0 +1,3 @@
+Removing traps
+End of exit_func
+Done: 0
diff --git a/shell/ash_test/ash-signals/signal8.tests b/shell/ash_test/ash-signals/signal8.tests
new file mode 100755
index 000000000..731af7477
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal8.tests
@@ -0,0 +1,18 @@
+"$THIS_SH" -c '
+exit_func() {
+ echo "Removing traps"
+ trap - EXIT TERM INT
+ echo "End of exit_func"
+}
+set -e
+trap exit_func EXIT TERM INT
+sleep 2
+exit 77
+' &
+
+sleep 1
+# BUG: ash kills -PGRP, but in non-interactive shell we do not create pgrps!
+# In this case, bash kills by PID, not PGRP.
+kill -TERM %1
+wait
+echo Done: $?
diff --git a/shell/ash_test/ash-signals/signal9.right b/shell/ash_test/ash-signals/signal9.right
new file mode 100644
index 000000000..39572f30e
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal9.right
@@ -0,0 +1,3 @@
+Removing traps
+End of exit_func
+Done: 0
diff --git a/shell/ash_test/ash-signals/signal9.tests b/shell/ash_test/ash-signals/signal9.tests
new file mode 100755
index 000000000..18e71012b
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal9.tests
@@ -0,0 +1,21 @@
+# Note: the inner script is a test which checks for a different bug
+# (ordering between INT handler and exit on "set -e"),
+# but so far I did not figure out how to simulate it non-interactively.
+
+"$THIS_SH" -c '
+exit_func() {
+ echo "Removing traps"
+ trap - EXIT TERM INT
+ echo "End of exit_func"
+}
+set -e
+trap exit_func EXIT TERM INT
+sleep 2
+exit 77
+' &
+
+child=$!
+sleep 1
+kill -TERM $child
+wait
+echo Done: $?