aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-26 13:53:42 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-26 13:53:42 +0000
commit5c1327035995cebd1d36f9cb1943084b29ab7ae8 (patch)
treeaf2323cdc07a34961d34273a9e878e9ed65e1b66
parent87d5fd984e3e7b26fb15269f44a32ddf6f828fd8 (diff)
downloadbusybox-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.right8
-rwxr-xr-xshell/ash_test/ash-signals/signal1.tests15
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
2trap -- 'echo got signal' USR1 2trap -- 'echo got signal' USR1
3sent 1 signal 3sent 1 signal
4got signal 4got signal
5sleep interrupted 5wait interrupted
6trap -- 'echo got signal' USR1 6trap -- 'echo got signal' USR1
7sent 2 signal 7sent 2 signal
8got signal 8got signal
9sleep interrupted 9wait interrupted
10trap -- 'echo got signal' USR1 10trap -- 'echo got signal' USR1
11sent 3 signal 11sent 3 signal
12got signal 12got signal
13sleep interrupted 13wait interrupted
14trap -- 'echo got signal' USR1 14trap -- 'echo got signal' USR1
15sent 4 signal 15sent 4 signal
16got signal 16got signal
17sleep interrupted 17wait interrupted
18trap -- 'echo got signal' USR1 18trap -- 'echo got signal' USR1
19sent 5 signal 19sent 5 signal
20sleep completed 20sleep 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 @@
1sleeping=true
2
3trap "echo got signal" USR1 1trap "echo got signal" USR1
4 2
5for try in 1 2 3 4 5; do 3for 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"
9done & 7done &
10 8
11sleep 10 & 9sleep 2 &
12 10
11sleeping=true
13while $sleeping; do 12while $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
24done 23done