From 2d70eabb2812a44bf23d3390797bd387ba426ddc Mon Sep 17 00:00:00 2001
From: pjd <pjd@FreeBSD.org>
Date: Mon, 7 Nov 2005 16:56:16 +0000
Subject: Add tests for -t option with short tty name - pkill(1) should accept
 both (eg. "ttyv0" and "v0").

---
 tools/regression/usr.bin/pkill/pgrep-t.t | 15 ++++++++++++---
 tools/regression/usr.bin/pkill/pkill-t.t | 21 ++++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

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

diff --git a/tools/regression/usr.bin/pkill/pgrep-t.t b/tools/regression/usr.bin/pkill/pgrep-t.t
index 7fb580d..7e81ada 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-t.t b/tools/regression/usr.bin/pkill/pkill-t.t
index 73458f5..cbef527 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
-- 
cgit v1.1