aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2019-09-22 09:45:30 -0500
committerRob Landley <rob@landley.net>2019-09-22 09:45:30 -0500
commite794647d2ac93a968c25491fe3681a9613c410e6 (patch)
treedc9a05f9478e5eb499a584835191e5c1c9442071 /tests
parent49f5ac02c55426b8f7dd1ba22da2d02b0074366d (diff)
downloadtoybox-e794647d2ac93a968c25491fe3681a9613c410e6.tar.gz
Avoid spurious test failures when fork() coincides with signal being sent,
then pgrep finds child that hasn't exec("sleep") yet. So add 1/10 sec sleep to let exec() happen before pgrep. While we're there fix spurious "terminated" messages and reorder test file creation so it fits in 80 columns.
Diffstat (limited to 'tests')
-rw-r--r--tests/killall.test17
1 files changed, 7 insertions, 10 deletions
diff --git a/tests/killall.test b/tests/killall.test
index b15dbf0f..7b2cee33 100644
--- a/tests/killall.test
+++ b/tests/killall.test
@@ -4,21 +4,18 @@
#testing "name" "command" "result" "infile" "stdin"
-echo "#!$(which sh)
-while true; do
- sleep 0.1
-done" > toybox.killall.test.script
-chmod a+x toybox.killall.test.script
-cp toybox.killall.test.script toybox.test
+echo -e "#!$(which sh)\nwhile true; do sleep 0.1; done" > toybox.test
+chmod a+x toybox.test
+cp toybox.test toybox.killall.test.script
tst=toybox.test
-./$tst &
-testing "short name" "killall -w $tst && echo killed ; \
+(./$tst 2>/dev/null &)
+testing "short name" "killall -w $tst && echo killed ; sleep 0.1; \
pgrep -l $tst || echo really" "killed\nreally\n" "" ""
tst=toybox.killall.test.script
-./$tst &
-testing "long name" "killall -w $tst && echo killed ; \
+(./$tst 2>/dev/null &)
+testing "long name" "killall -w $tst && echo killed ; sleep 0.1; \
pgrep -l $tst || echo really" "killed\nreally\n" "" ""
rm -f toybox.killall.test.script toybox.test