[git commit] hush: "adopt" ash signal4.tests

Denys Vlasenko vda.linux at googlemail.com
Thu Jul 6 16:40:45 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=74562984720c3f7d0a62ffbfd8ee78391c39c1e8
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/hush.c                               | 2 +-
 shell/hush_test/hush-signals/signal4.right | 4 ++++
 shell/hush_test/hush-signals/signal4.tests | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/shell/hush.c b/shell/hush.c
index aee77d0..64b33cf 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -9486,7 +9486,7 @@ static int FAST_FUNC builtin_trap(char **argv)
 			if (sig < 0 || sig >= NSIG) {
 				ret = EXIT_FAILURE;
 				/* Mimic bash message exactly */
-				bb_perror_msg("trap: %s: invalid signal specification", argv[-1]);
+				bb_error_msg("trap: %s: invalid signal specification", argv[-1]);
 				continue;
 			}
 
diff --git a/shell/hush_test/hush-signals/signal4.right b/shell/hush_test/hush-signals/signal4.right
new file mode 100644
index 0000000..2d06247
--- /dev/null
+++ b/shell/hush_test/hush-signals/signal4.right
@@ -0,0 +1,4 @@
+hush: trap: BADNAME: invalid signal specification
+1
+Trapped
+Ok
diff --git a/shell/hush_test/hush-signals/signal4.tests b/shell/hush_test/hush-signals/signal4.tests
new file mode 100755
index 0000000..6f1c4a9
--- /dev/null
+++ b/shell/hush_test/hush-signals/signal4.tests
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+trap "echo Trapped" BADNAME TERM; echo $?
+kill $$
+echo Ok


More information about the busybox-cvs mailing list