diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-06 18:40:45 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-06 18:40:45 +0200 |
| commit | 74562984720c3f7d0a62ffbfd8ee78391c39c1e8 (patch) | |
| tree | 17d8ed82bdfc86dc8074873c7e78cc7d2ec2bc18 | |
| parent | b18b04c8a832148fb47aec20ce1e74267d2fb438 (diff) | |
| download | busybox-74562984720c3f7d0a62ffbfd8ee78391c39c1e8.tar.gz | |
hush: "adopt" ash signal4.tests
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/hush.c | 2 | ||||
| -rw-r--r-- | shell/hush_test/hush-signals/signal4.right | 4 | ||||
| -rwxr-xr-x | shell/hush_test/hush-signals/signal4.tests | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c index aee77d03b..64b33cf1c 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 000000000..2d0624714 --- /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 000000000..6f1c4a950 --- /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 |