5 files changed, 118 insertions, 42 deletions

diff --git a/tools/regression/usr.bin/pkill/pgrep-F.t b/tools/regression/usr.bin/pkill/pgrep-F.t
index a4c1c6cd90567..fd76e6451de3c 100644
--- a/tools/regression/usr.bin/pkill/pgrep-F.t
+++ b/tools/regression/usr.bin/pkill/pgrep-F.t
@@ -19,6 +19,6 @@ if [ "$pid" = "$chpid" ]; then
 else
 	echo "not ok - $name"
 fi
-kill $chpid
+kill "$chpid"
 rm -f $pidfile
 rm -f $sleep
diff --git a/tools/regression/usr.bin/pkill/pgrep-j.t b/tools/regression/usr.bin/pkill/pgrep-j.t
index 37c1e73f7e180..861d5751cc8d7 100644
--- a/tools/regression/usr.bin/pkill/pgrep-j.t
+++ b/tools/regression/usr.bin/pkill/pgrep-j.t
@@ -3,43 +3,73 @@
 
 base=`basename $0`
 
-echo "1..2"
+echo "1..3"
 
 name="pgrep -j <jid>"
 if [ `id -u` -eq 0 ]; then
 	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 	ln -sf /bin/sleep $sleep
-	jail / temp 127.0.0.1 $sleep 5 &
-	sleep 0.3
+	jail / $base-1 127.0.0.1 $sleep 5 &
 	chpid=$!
-	jid=`jls | egrep '127\.0\.0\.1.*temp.*\/' | awk '{print $1}'`
+	jail / $base-2 127.0.0.1 $sleep 5 &
+	chpid2=$!
+	$sleep 5 &
+	chpid3=$!
+	sleep 0.5
+	jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"`
 	pid=`pgrep -f -j $jid $sleep`
 	if [ "$pid" = "$chpid" ]; then
 		echo "ok 1 - $name"
 	else
 		echo "not ok 1 - $name"
 	fi
-	kill $chpid
+	kill $chpid $chpid2 $chpid3
 	rm -f $sleep
 else
 	echo "ok 1 - $name # skip Test needs uid 0."
 fi
 
-name="pgrep -j 0"
+name="pgrep -j any"
 if [ `id -u` -eq 0 ]; then
 	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 	ln -sf /bin/sleep $sleep
-	jail / temp 127.0.0.1 $sleep 5 &
-	sleep 0.3
+	jail / $base-1 127.0.0.1 $sleep 5 &
 	chpid=$!
-	pid=`pgrep -f -j 0 $sleep`
-	if [ "$pid" = "$chpid" ]; then
+	jail / $base-2 127.0.0.1 $sleep 5 &
+	chpid2=$!
+	$sleep 5 &
+	chpid3=$!
+	sleep 0.5
+	pids=`pgrep -f -j any $sleep | sort`
+	refpids=`{ echo $chpid; echo $chpid2; } | sort`
+	if [ "$pids" = "$refpids" ]; then
 		echo "ok 2 - $name"
 	else
 		echo "not ok 2 - $name"
 	fi
-	kill $chpid
+	kill $chpid $chpid2 $chpid3
 	rm -f $sleep
 else
 	echo "ok 2 - $name # skip Test needs uid 0."
 fi
+
+name="pgrep -j none"
+if [ `id -u` -eq 0 ]; then
+	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+	ln -sf /bin/sleep $sleep
+	$sleep 5 &
+	chpid=$!
+	jail / $base 127.0.0.1 $sleep 5 &
+	chpid2=$!
+	sleep 0.5
+	pid=`pgrep -f -j none $sleep`
+	if [ "$pid" = "$chpid" ]; then
+		echo "ok 3 - $name"
+	else
+		echo "not ok 3 - $name"
+	fi
+	kill $chpid $chpid2
+	rm -f $sleep
+else
+	echo "ok 3 - $name # skip Test needs uid 0."
+fi
diff --git a/tools/regression/usr.bin/pkill/pgrep-t.t b/tools/regression/usr.bin/pkill/pgrep-t.t
index 7fb580d2213f6..7e81ada756880 100644
--- a/tools/regression/usr.bin/pkill/pgrep-t.t
+++ b/tools/regression/usr.bin/pkill/pgrep-t.t
@@ -3,12 +3,15 @@
 
 base=`basename $0`
 
-echo "1..1"
+echo "1..2"
 
 name="pgrep -t <tty>"
 tty=`ps -o tty -p $$ | tail -1`
 if [ "$tty" = "??" ]; then
 	tty="-"
+	ttyshort="-"
+else
+	ttyshort=`echo $tty | cut -c 4-`
 fi
 sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 ln -sf /bin/sleep $sleep
@@ -17,9 +20,15 @@ sleep 0.3
 chpid=$!
 pid=`pgrep -f -t $tty $sleep`
 if [ "$pid" = "$chpid" ]; then
-	echo "ok - $name"
+	echo "ok 1 - $name"
+else
+	echo "not ok 1 - $name"
+fi
+pid=`pgrep -f -t $ttyshort $sleep`
+if [ "$pid" = "$chpid" ]; then
+	echo "ok 2 - $name"
 else
-	echo "not ok - $name"
+	echo "not ok 2 - $name"
 fi
 kill $chpid
 rm -f $sleep
diff --git a/tools/regression/usr.bin/pkill/pkill-j.t b/tools/regression/usr.bin/pkill/pkill-j.t
index 00393f1ab86c2..5cb0311582bff 100644
--- a/tools/regression/usr.bin/pkill/pkill-j.t
+++ b/tools/regression/usr.bin/pkill/pkill-j.t
@@ -3,47 +3,69 @@
 
 base=`basename $0`
 
-echo "1..2"
+echo "1..3"
 
 name="pkill -j <jid>"
 if [ `id -u` -eq 0 ]; then
 	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 	ln -sf /bin/sleep $sleep
-	jail / temp 127.0.0.1 $sleep 5 &
-	sleep 0.3
-	jid=`jls | egrep '127\.0\.0\.1.*temp.*\/' | awk '{print $1}'`
-	pkill -f -j $jid $sleep
-	ec=$?
-	case $ec in
-	0)
+	jail / $base-1 127.0.0.1 $sleep 5 &
+	chpid=$!
+	jail / $base-2 127.0.0.1 $sleep 5 &
+	chpid2=$!
+	$sleep 5 &
+	chpid3=$!
+	sleep 0.5
+	jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"`
+	if pkill -f -j $jid $sleep && sleep 0.5 &&
+	    ! kill $chpid && kill $chpid2 $chpid3; then
 		echo "ok 1 - $name"
-		;;
-	*)
+	else
 		echo "not ok 1 - $name"
-		;;
-	esac
+	fi 2>/dev/null
 	rm -f $sleep
 else
 	echo "ok 1 - $name # skip Test needs uid 0."
 fi
 
-name="pkill -j 0"
+name="pkill -j any"
 if [ `id -u` -eq 0 ]; then
 	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 	ln -sf /bin/sleep $sleep
-	jail / temp 127.0.0.1 $sleep 5 &
-	sleep 0.3
-	pkill -f -j 0 $sleep
-	ec=$?
-	case $ec in
-	0)
+	jail / $base-1 127.0.0.1 $sleep 5 &
+	chpid=$!
+	jail / $base-2 127.0.0.1 $sleep 5 &
+	chpid2=$!
+	$sleep 5 &
+	chpid3=$!
+	sleep 0.5
+	if pkill -f -j any $sleep && sleep 0.5 &&
+	    ! kill $chpid && ! kill $chpid2 && kill $chpid3; then
 		echo "ok 2 - $name"
-		;;
-	*)
+	else
 		echo "not ok 2 - $name"
-		;;
-	esac
+	fi 2>/dev/null
 	rm -f $sleep
 else
-	echo "ok 1 - $name # skip Test needs uid 0."
+	echo "ok 2 - $name # skip Test needs uid 0."
+fi
+
+name="pkill -j none"
+if [ `id -u` -eq 0 ]; then
+	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+	ln -sf /bin/sleep $sleep
+	$sleep 5 &
+	chpid=$!
+	jail / $base 127.0.0.1 $sleep 5 &
+	chpid2=$!
+	sleep 0.5
+	if pkill -f -j none $sleep && sleep 0.5 &&
+	    ! kill $chpid && kill $chpid2; then
+		echo "ok 3 - $name"
+	else
+		echo "not ok 3 - $name"
+	fi 2>/dev/null
+	rm -f $sleep
+else
+	echo "ok 3 - $name # skip Test needs uid 0."
 fi
diff --git a/tools/regression/usr.bin/pkill/pkill-t.t b/tools/regression/usr.bin/pkill/pkill-t.t
index 73458f56eeb1f..cbef527cd50b2 100644
--- a/tools/regression/usr.bin/pkill/pkill-t.t
+++ b/tools/regression/usr.bin/pkill/pkill-t.t
@@ -3,12 +3,15 @@
 
 base=`basename $0`
 
-echo "1..1"
+echo "1..2"
 
 name="pkill -t <tty>"
 tty=`ps -o tty -p $$ | tail -1`
 if [ "$tty" = "??" ]; then
 	tty="-"
+	ttyshort="-"
+else
+	ttyshort=`echo $tty | cut -c 4-`
 fi
 sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 ln -sf /bin/sleep $sleep
@@ -18,10 +21,22 @@ pkill -f -t $tty $sleep
 ec=$?
 case $ec in
 0)
-	echo "ok - $name"
+	echo "ok 1 - $name"
 	;;
 *)
-	echo "not ok - $name"
+	echo "not ok 1 - $name"
+	;;
+esac
+$sleep 5 &
+sleep 0.3
+pkill -f -t $ttyshort $sleep
+ec=$?
+case $ec in
+0)
+	echo "ok 2 - $name"
+	;;
+*)
+	echo "not ok 2 - $name"
 	;;
 esac
 rm -f $sleep