diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-26 13:53:42 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-26 13:53:42 +0000 |
commit | 5c1327035995cebd1d36f9cb1943084b29ab7ae8 (patch) | |
tree | af2323cdc07a34961d34273a9e878e9ed65e1b66 | |
parent | 87d5fd984e3e7b26fb15269f44a32ddf6f828fd8 (diff) | |
download | busybox-w32-5c1327035995cebd1d36f9cb1943084b29ab7ae8.tar.gz busybox-w32-5c1327035995cebd1d36f9cb1943084b29ab7ae8.tar.bz2 busybox-w32-5c1327035995cebd1d36f9cb1943084b29ab7ae8.zip |
ash: fix testcase to not sleep for whole 10 seconds,
gets annoying pretty fast. Also fix wrong message there.
-rw-r--r-- | shell/ash_test/ash-signals/signal1.right | 8 | ||||
-rwxr-xr-x | shell/ash_test/ash-signals/signal1.tests | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/shell/ash_test/ash-signals/signal1.right b/shell/ash_test/ash-signals/signal1.right index 66c30a5f0..cf403ac62 100644 --- a/shell/ash_test/ash-signals/signal1.right +++ b/shell/ash_test/ash-signals/signal1.right | |||
@@ -2,19 +2,19 @@ got signal | |||
2 | trap -- 'echo got signal' USR1 | 2 | trap -- 'echo got signal' USR1 |
3 | sent 1 signal | 3 | sent 1 signal |
4 | got signal | 4 | got signal |
5 | sleep interrupted | 5 | wait interrupted |
6 | trap -- 'echo got signal' USR1 | 6 | trap -- 'echo got signal' USR1 |
7 | sent 2 signal | 7 | sent 2 signal |
8 | got signal | 8 | got signal |
9 | sleep interrupted | 9 | wait interrupted |
10 | trap -- 'echo got signal' USR1 | 10 | trap -- 'echo got signal' USR1 |
11 | sent 3 signal | 11 | sent 3 signal |
12 | got signal | 12 | got signal |
13 | sleep interrupted | 13 | wait interrupted |
14 | trap -- 'echo got signal' USR1 | 14 | trap -- 'echo got signal' USR1 |
15 | sent 4 signal | 15 | sent 4 signal |
16 | got signal | 16 | got signal |
17 | sleep interrupted | 17 | wait interrupted |
18 | trap -- 'echo got signal' USR1 | 18 | trap -- 'echo got signal' USR1 |
19 | sent 5 signal | 19 | sent 5 signal |
20 | sleep completed | 20 | sleep completed |
diff --git a/shell/ash_test/ash-signals/signal1.tests b/shell/ash_test/ash-signals/signal1.tests index 49a395bad..098d21fd4 100755 --- a/shell/ash_test/ash-signals/signal1.tests +++ b/shell/ash_test/ash-signals/signal1.tests | |||
@@ -1,24 +1,23 @@ | |||
1 | sleeping=true | ||
2 | |||
3 | trap "echo got signal" USR1 | 1 | trap "echo got signal" USR1 |
4 | 2 | ||
5 | for try in 1 2 3 4 5; do | 3 | for try in 1 2 3 4 5; do |
6 | kill -USR1 $$ | 4 | kill -USR1 $$ |
7 | sleep 1 | 5 | sleep 0.2 |
8 | echo sent $try signal | 6 | echo "sent $try signal" |
9 | done & | 7 | done & |
10 | 8 | ||
11 | sleep 10 & | 9 | sleep 2 & |
12 | 10 | ||
11 | sleeping=true | ||
13 | while $sleeping; do | 12 | while $sleeping; do |
14 | trap | 13 | trap |
15 | if wait %%; then | 14 | if wait %%; then |
16 | echo sleep completed | 15 | echo "sleep completed" |
17 | sleeping=false | 16 | sleeping=false |
18 | elif [ $? == 127 ]; then | 17 | elif [ $? == 127 ]; then |
19 | echo no sleep tonite | 18 | echo "BUG: no processes to wait for?!" |
20 | sleeping=false | 19 | sleeping=false |
21 | else | 20 | else |
22 | echo sleep interrupted; | 21 | echo "wait interrupted" |
23 | fi | 22 | fi |
24 | done | 23 | done |