From 034dae7724ea0c28e291afdb0b885c9ebc466fad Mon Sep 17 00:00:00 2001
From: pjd <pjd@FreeBSD.org>
Date: Thu, 25 Aug 2005 20:11:39 +0000
Subject: '-F' option behaviour was reverted, so revert previous commit.

---
 tools/regression/usr.bin/pkill/pgrep-F.t | 5 +++--
 tools/regression/usr.bin/pkill/pkill-F.t | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'tools/regression/usr.bin')

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
-- 
cgit v1.1