Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Mar 2016 18:15:43 +0000 (UTC)
From:      Peter Holm <pho@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r297316 - user/pho/stress2/misc
Message-ID:  <201603271815.u2RIFhrv026981@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pho
Date: Sun Mar 27 18:15:43 2016
New Revision: 297316
URL: https://svnweb.freebsd.org/changeset/base/297316

Log:
  Set exit status 0.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  user/pho/stress2/misc/kevent7.sh
  user/pho/stress2/misc/ldt.sh
  user/pho/stress2/misc/mac.sh
  user/pho/stress2/misc/nullfs17.sh
  user/pho/stress2/misc/nullfs3.sh
  user/pho/stress2/misc/procfs2.sh
  user/pho/stress2/misc/quota5.sh
  user/pho/stress2/misc/tmpfs3.sh
  user/pho/stress2/misc/trim6.sh

Modified: user/pho/stress2/misc/kevent7.sh
==============================================================================
--- user/pho/stress2/misc/kevent7.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/kevent7.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -59,7 +59,10 @@ chmod 777 $mntpoint
 for i in `jot 5`; do
 	(cd $mntpoint; /tmp/kevent7 $* < /dev/null) &
 	sleep 60
-	killall -9 kevent7
+	while pgrep -q kevent7; do
+		pkill -9 kevent7
+		sleep 1
+	done
 done
 
 for i in `jot 5`; do
@@ -73,7 +76,7 @@ if mount | grep -q md${mdstart}$part; th
 	exit 1
 fi
 rm -f /tmp/kevent7
-exit
+exit 0
 EOF
 #include <sys/types.h>
 #include <err.h>

Modified: user/pho/stress2/misc/ldt.sh
==============================================================================
--- user/pho/stress2/misc/ldt.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/ldt.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -369,3 +369,4 @@ if [ "`uname -p`" = "amd64" ]; then
 	[ -x ioperm_static_i386 ] && ./ioperm_static_i386
 	[ -x fault_static_i386 ]  && ./fault_static_i386
 fi
+exit 0

Modified: user/pho/stress2/misc/mac.sh
==============================================================================
--- user/pho/stress2/misc/mac.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/mac.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -32,7 +32,7 @@
 
 if sysctl security.mac.test 2>&1 | grep -q unknown; then
    echo "Kernel must be configured with MAC and MAC_TEST!"
-   exit 1
+   exit 0
 fi
 
 ./crossmp.sh

Modified: user/pho/stress2/misc/nullfs17.sh
==============================================================================
--- user/pho/stress2/misc/nullfs17.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/nullfs17.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -60,7 +60,7 @@ if [ $# -eq 0 ]; then
 	for i in `jot $mounts`; do
 		umount ${nullfs_dstdir}$i > /dev/null 2>&1
 	done
-
+	exit 0
 else
 	if [ $1 = find ]; then
 		while [ -f $CONT ]; do

Modified: user/pho/stress2/misc/nullfs3.sh
==============================================================================
--- user/pho/stress2/misc/nullfs3.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/nullfs3.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -55,3 +55,4 @@ cd /
 umount $mp
 
 mount | grep -q $mp && umount -f $mp
+exit 0

Modified: user/pho/stress2/misc/procfs2.sh
==============================================================================
--- user/pho/stress2/misc/procfs2.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/procfs2.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -35,3 +35,4 @@ for i in `find /proc ! -type d`; do
 	dd if=$i of=/dev/null   > /dev/null 2>&1
 	dd if=/dev/random of=$i > /dev/null 2>&1
 done
+exit 0

Modified: user/pho/stress2/misc/quota5.sh
==============================================================================
--- user/pho/stress2/misc/quota5.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/quota5.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -33,7 +33,7 @@
 mount | grep -q "on /tmp (ufs," || exit 0
 if ! grep /tmp /etc/fstab | grep -q quota ; then
 	echo "/tmp must have quota enabled!"
-	exit 2
+	exit 0
 fi
 edquota -u -f /tmp -e /tmp:1500000:1400000:200000:180000 $testuser
 edquota -g -f /tmp -e /tmp:1500000:1400000:200000:180000 $testuser

Modified: user/pho/stress2/misc/tmpfs3.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs3.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/tmpfs3.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -44,3 +44,4 @@ export runRUNTIME=10m            # Run t
 
 umount $mntpoint
 mount | grep "$mntpoint" | grep -q tmpfs && umount -f $mntpoint
+exit 0

Modified: user/pho/stress2/misc/trim6.sh
==============================================================================
--- user/pho/stress2/misc/trim6.sh	Sun Mar 27 17:22:27 2016	(r297315)
+++ user/pho/stress2/misc/trim6.sh	Sun Mar 27 18:15:43 2016	(r297316)
@@ -52,8 +52,9 @@ max=$((128 * 1024)) # Max is 128 GB
 [ $free -gt $max ] && free=$max
 mp=$2
 image=`echo $mp/diskimage | sed s#//#/#` # fix "//" for case mp = "/"
-trap "rm -f $image" EXIT SIGINT
+trap "rm -f $image" EXIT INT
 
 echo "dd if=/dev/zero of=$image bs=1m count=$free"
 dd if=/dev/zero of=$image bs=1m count=$free 2>&1 |
     egrep -v 'records|transferred'
+exit 0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603271815.u2RIFhrv026981>