svn commit: r317557 - user/pho/stress2/misc

[Peter Holm]

Author: pho
Date: Fri Apr 28 15:15:26 2017
New Revision: 317557
URL: https://svnweb.freebsd.org/changeset/base/317557

Log:
  Need the x option for ps, in case we do not have a controlling terminal.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/fifo3.sh
  user/pho/stress2/misc/graid1_2.sh
  user/pho/stress2/misc/mlockall.sh
  user/pho/stress2/misc/mountro.sh
  user/pho/stress2/misc/ptrace10.sh
  user/pho/stress2/misc/truncate2.sh
  user/pho/stress2/misc/truss.sh
  user/pho/stress2/misc/vfork.sh

Modified: user/pho/stress2/misc/fifo3.sh
==============================================================================
--- user/pho/stress2/misc/fifo3.sh	Fri Apr 28 14:48:29 2017	(r317556)
+++ user/pho/stress2/misc/fifo3.sh	Fri Apr 28 15:15:26 2017	(r317557)
@@ -197,7 +197,7 @@ mount /dev/md${mdstart}$part $mntpoint
 (cd $mntpoint; /tmp/fifo3 ) &
 
 while pgrep -q fifo3; do
-	ps -l | grep -v grep | grep -q fifoor &&
+	ps -lx | grep -v grep | grep -q fifoor &&
 	    { echo FAIL; exit 1; }
 	sleep 2
 done

Modified: user/pho/stress2/misc/graid1_2.sh
==============================================================================
--- user/pho/stress2/misc/graid1_2.sh	Fri Apr 28 14:48:29 2017	(r317556)
+++ user/pho/stress2/misc/graid1_2.sh	Fri Apr 28 15:15:26 2017	(r317557)
@@ -72,7 +72,7 @@ while [ $((`date '+%s'` - start)) -lt 30
 	gmirror rebuild test /dev/md$md1
 	sleep 2
 	n=0
-	while ps -l | grep -v grep | grep graid1_2 | grep -q D; do
+	while ps -lx | grep -v grep | grep graid1_2 | grep -q D; do
 		opid=$pid
 		pid=`pgrep graid1_2`
 		[ -z "$pid" -o "$pid" != "$opid" ] && n=0
@@ -80,7 +80,7 @@ while [ $((`date '+%s'` - start)) -lt 30
 		n=$((n + 1))
 		if [ $n -gt 180 ]; then
 			echo FAIL
-			ps -l | grep -v grep | grep graid1_2 | grep D
+			ps -lx | grep -v grep | grep graid1_2 | grep D
 			exit 1
 		fi
 	done

Modified: user/pho/stress2/misc/mlockall.sh
==============================================================================
--- user/pho/stress2/misc/mlockall.sh	Fri Apr 28 14:48:29 2017	(r317556)
+++ user/pho/stress2/misc/mlockall.sh	Fri Apr 28 15:15:26 2017	(r317557)
@@ -43,7 +43,8 @@ rm -f mlockall.c
 for i in `jot 10`; do
 	/tmp/mlockall &
 	sleep 1
-	ps | grep /tmp/mlockall | grep -v grep | awk '{print $1}' | while read pid; do
+	ps -x | grep /tmp/mlockall | grep -v grep | awk '{print $1}' | \
+	    while read pid; do
 		kill -2 $pid
 		kill -9 $pid
 	done

Modified: user/pho/stress2/misc/mountro.sh
==============================================================================
--- user/pho/stress2/misc/mountro.sh	Fri Apr 28 14:48:29 2017	(r317556)
+++ user/pho/stress2/misc/mountro.sh	Fri Apr 28 15:15:26 2017	(r317557)
@@ -64,5 +64,5 @@ df -i $mntpoint
 umount -f $mntpoint    > /dev/null 2>&1
 mdconfig -d -u $mdstart
 rm -f $D
-kill `ps | grep run.sh | grep -v grep | awk '{print $1}'`
+kill `ps -x | grep run.sh | grep -v grep | awk '{print $1}'`
 wait

Modified: user/pho/stress2/misc/ptrace10.sh
==============================================================================
--- user/pho/stress2/misc/ptrace10.sh	Fri Apr 28 14:48:29 2017	(r317556)
+++ user/pho/stress2/misc/ptrace10.sh	Fri Apr 28 15:15:26 2017	(r317557)
@@ -125,7 +125,7 @@ rm ptrace10.c
 ./ptrace10
 s=$?
 if [ $s -ne 0 ]; then
-	ps -lH | grep -v grep | egrep "UID|ptrace10"
+	ps -lxH | grep -v grep | egrep "UID|ptrace10"
 	while pgrep -q ptrace10; do
 		pkill -9 ptrace10
 	done

Modified: user/pho/stress2/misc/truncate2.sh
==============================================================================
--- user/pho/stress2/misc/truncate2.sh	Fri Apr 28 14:48:29 2017	(r317556)
+++ user/pho/stress2/misc/truncate2.sh	Fri Apr 28 15:15:26 2017	(r317557)
@@ -41,7 +41,7 @@ cd $RUNDIR
 /tmp/truncate2 &
 
 sleep 1
-while ps | grep -v grep | egrep -q "truncate2$"; do
+while ps -x | grep -v grep | egrep -q "truncate2$"; do
 	$here/../testcases/swap/swap -t 2m -i 20
 done
 

Modified: user/pho/stress2/misc/truss.sh
==============================================================================
--- user/pho/stress2/misc/truss.sh	Fri Apr 28 14:48:29 2017	(r317556)
+++ user/pho/stress2/misc/truss.sh	Fri Apr 28 15:15:26 2017	(r317557)
@@ -59,7 +59,7 @@ sleep .5
 for i in `jot 30`; do
 	truss /tmp/ttruss 10 > /dev/null 2>&1 &
 	sleep 11
-	if ps -l | grep -v grep | grep -q uwrlck; then
+	if ps -lx | grep -v grep | grep -q uwrlck; then
 		echo FAIL
 		ps -lH | egrep -v "grep|truss.sh" | grep truss
 		while pkill -9 swap; do
@@ -75,7 +75,7 @@ done
 sleep 2
 if pgrep -q ttruss; then
 	echo FAIL
-	ps -lH | grep -v grep | grep ttruss
+	ps -lxH | grep -v grep | grep ttruss
 	s=1
 fi
 

Modified: user/pho/stress2/misc/vfork.sh
==============================================================================
--- user/pho/stress2/misc/vfork.sh	Fri Apr 28 14:48:29 2017	(r317556)
+++ user/pho/stress2/misc/vfork.sh	Fri Apr 28 15:15:26 2017	(r317557)
@@ -98,7 +98,7 @@ main(int argc, char **argv)
 	bzero(&ru, sizeof(ru));
 	usleep(2000);
 	if ((rpid = wait4(-1, &status, WNOHANG, &ru)) == -1) {
-			err(1, "OK wait4");
+			err(0, "OK wait4");
 	}
 	if (rpid == 0) {
 //		fprintf(stderr, "No rusage info.\n");
@@ -122,10 +122,12 @@ rm  vfork2.c
 
 ./vfork1 &
 sleep .2
-childpid=`ps -l | grep -v grep | grep vfork1 |
+childpid=`ps -lx | grep -v grep | grep vfork1 |
     tail -1 | grep nanslp | awk '{print $2}'`
 # Seen before fix:
 # failed to set signal flags properly for ast()
 ./vfork2 $childpid
+s=$?
 
 rm -f vfork1 vfork2
+exit $s