summaryrefslogtreecommitdiffstats
path: root/tools/regression/usr.bin
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2005-08-25 20:11:39 +0000
committerpjd <pjd@FreeBSD.org>2005-08-25 20:11:39 +0000
commit034dae7724ea0c28e291afdb0b885c9ebc466fad (patch)
treee14263d25ef862cc94f65caeac31c4500e4b59c7 /tools/regression/usr.bin
parentfe9f2ab73454ea914fc6c5338b53d5b7a15399ae (diff)
downloadFreeBSD-src-034dae7724ea0c28e291afdb0b885c9ebc466fad.zip
FreeBSD-src-034dae7724ea0c28e291afdb0b885c9ebc466fad.tar.gz
'-F' option behaviour was reverted, so revert previous commit.
Diffstat (limited to 'tools/regression/usr.bin')
-rw-r--r--tools/regression/usr.bin/pkill/pgrep-F.t5
-rw-r--r--tools/regression/usr.bin/pkill/pkill-F.t3
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/regression/usr.bin/pkill/pgrep-F.t b/tools/regression/usr.bin/pkill/pgrep-F.t
index b9d844c..fd76e64 100644
--- a/tools/regression/usr.bin/pkill/pgrep-F.t
+++ b/tools/regression/usr.bin/pkill/pgrep-F.t
@@ -9,9 +9,10 @@ name="pgrep -F <pidfile>"
pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1
sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
ln -sf /bin/sleep $sleep
-daemon -p $pidfile $sleep 5
+$sleep 5 &
sleep 0.3
-chpid=`cat $pidfile`
+chpid=$!
+echo $chpid > $pidfile
pid=`pgrep -f -F $pidfile $sleep`
if [ "$pid" = "$chpid" ]; then
echo "ok - $name"
diff --git a/tools/regression/usr.bin/pkill/pkill-F.t b/tools/regression/usr.bin/pkill/pkill-F.t
index ebde428..732d807 100644
--- a/tools/regression/usr.bin/pkill/pkill-F.t
+++ b/tools/regression/usr.bin/pkill/pkill-F.t
@@ -9,8 +9,9 @@ name="pkill -F <pidfile>"
pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1
sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
ln -sf /bin/sleep $sleep
-daemon -p $pidfile $sleep 5
+$sleep 5 &
sleep 0.3
+echo $! > $pidfile
pkill -f -F $pidfile $sleep
ec=$?
case $ec in
OpenPOWER on IntegriCloud