From 92ca5af53128aba511c4144c173283a3e810af8b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sun, 2 Apr 2017 12:20:53 -0700 Subject: Make pkill tests runnable on a toybox-only system. Also use a much stricter regex in the regex test to avoid killing innocent bystanders. --- tests/pkill.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/pkill.test b/tests/pkill.test index 3f20d260..c98b6a45 100755 --- a/tests/pkill.test +++ b/tests/pkill.test @@ -46,10 +46,10 @@ testing "-f pattern (multiple)" "pkill -f yes && sleep 1 && (pgrep yes || echo 'yes')" "yes\n" "" "" killall yes >/dev/null 2>&1 -yes >/dev/null & +yes this-is-unlikely-to-appear-otherwise >/dev/null & sleep 1 -testing "-s 0 -f pattern (regexp)" "pkill -s 0 -f ye* && sleep 1 && - (pgrep yes || echo 'yes')" "yes\n" "" "" +testing "-s 0 -f pattern (regexp)" "pkill -s 0 -f .*-unlikely-.*-otherwise && + sleep 1 && (pgrep yes || echo 'yes')" "yes\n" "" "" killall yes >/dev/null 2>&1 yes >/dev/null & @@ -85,7 +85,7 @@ killall yes >/dev/null 2>&1 yes >/dev/null & proc=$! -proc_p=`cat /proc/${proc}/stat | awk '{ print $4 }'` +proc_p=`cat /proc/${proc}/stat | cut -d' ' -f4` sleep 1 testing "-P parent_prodId pattern" "pkill -P $proc_p yes && sleep 1 && (pgrep yes || echo 'yes')" "yes\n" "" "" -- cgit v1.2.3