diff options
author | pjd <pjd@FreeBSD.org> | 2005-08-24 19:39:29 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2005-08-24 19:39:29 +0000 |
commit | 2cdfac31a9580d86e37ef62dd874a05b1942532b (patch) | |
tree | 1710758265c597ce32fc1f3b016308e62da12e89 | |
parent | 242683f73fe615f5b38446530c73e8cbf4db5343 (diff) | |
download | FreeBSD-src-2cdfac31a9580d86e37ef62dd874a05b1942532b.zip FreeBSD-src-2cdfac31a9580d86e37ef62dd874a05b1942532b.tar.gz |
'-F' option now needs locked pidfile. Modify regression tests respectively.
-rw-r--r-- | tools/regression/usr.bin/pkill/pgrep-F.t | 7 | ||||
-rw-r--r-- | tools/regression/usr.bin/pkill/pkill-F.t | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tools/regression/usr.bin/pkill/pgrep-F.t b/tools/regression/usr.bin/pkill/pgrep-F.t index a4c1c6c..b9d844c 100644 --- a/tools/regression/usr.bin/pkill/pgrep-F.t +++ b/tools/regression/usr.bin/pkill/pgrep-F.t @@ -9,16 +9,15 @@ name="pgrep -F <pidfile>" pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1 sleep=`mktemp /tmp/$base.XXXXXX` || exit 1 ln -sf /bin/sleep $sleep -$sleep 5 & +daemon -p $pidfile $sleep 5 sleep 0.3 -chpid=$! -echo $chpid > $pidfile +chpid=`cat $pidfile` pid=`pgrep -f -F $pidfile $sleep` if [ "$pid" = "$chpid" ]; then echo "ok - $name" else echo "not ok - $name" fi -kill $chpid +kill "$chpid" rm -f $pidfile rm -f $sleep diff --git a/tools/regression/usr.bin/pkill/pkill-F.t b/tools/regression/usr.bin/pkill/pkill-F.t index 732d807..ebde428 100644 --- a/tools/regression/usr.bin/pkill/pkill-F.t +++ b/tools/regression/usr.bin/pkill/pkill-F.t @@ -9,9 +9,8 @@ name="pkill -F <pidfile>" pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1 sleep=`mktemp /tmp/$base.XXXXXX` || exit 1 ln -sf /bin/sleep $sleep -$sleep 5 & +daemon -p $pidfile $sleep 5 sleep 0.3 -echo $! > $pidfile pkill -f -F $pidfile $sleep ec=$? case $ec in |