Date: Mon, 10 Oct 2016 10:58:18 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r306945 - user/pho/stress2/misc Message-ID: <201610101058.u9AAwIbL029243@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Mon Oct 10 10:58:18 2016 New Revision: 306945 URL: https://svnweb.freebsd.org/changeset/base/306945 Log: Fix or add cleanup after tests. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/core.sh user/pho/stress2/misc/core2.sh user/pho/stress2/misc/core3.sh user/pho/stress2/misc/credleak.sh user/pho/stress2/misc/crossmp6.sh user/pho/stress2/misc/link.sh user/pho/stress2/misc/mmap2.sh user/pho/stress2/misc/mmap27.sh user/pho/stress2/misc/mmap28.sh user/pho/stress2/misc/pfl.sh user/pho/stress2/misc/pthread9.sh user/pho/stress2/misc/rename10.sh user/pho/stress2/misc/rename7.sh user/pho/stress2/misc/suj10.sh user/pho/stress2/misc/symlink.sh user/pho/stress2/misc/symlink2.sh user/pho/stress2/misc/tmpfs9.sh user/pho/stress2/misc/truss.sh Modified: user/pho/stress2/misc/core.sh ============================================================================== --- user/pho/stress2/misc/core.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/core.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -49,7 +49,7 @@ for i in `jot 2`; do wait done done -rm -f core +rm -f /tmp/core exit EOF #include <err.h> Modified: user/pho/stress2/misc/core2.sh ============================================================================== --- user/pho/stress2/misc/core2.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/core2.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -62,7 +62,7 @@ wait mount | grep -q "on $mntpoint " && umount -f $mntpoint mdconfig -d -u $mdstart -rm -f core2 +rm -f /tmp/core2 exit EOF #include <sys/mman.h> Modified: user/pho/stress2/misc/core3.sh ============================================================================== --- user/pho/stress2/misc/core3.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/core3.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -96,7 +96,7 @@ status=$? mount | grep -q "on $mntpoint " && umount -f $mntpoint -rm -f core3 +rm -f /tmp/core3 exit $status EOF #include <sys/mman.h> Modified: user/pho/stress2/misc/credleak.sh ============================================================================== --- user/pho/stress2/misc/credleak.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/credleak.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -64,7 +64,7 @@ done > /dev/null 2>&1 while mount | grep $mntpoint | grep -q tmpfs; do umount $mntpoint || sleep 1 done -[ -n "`ls $mntpoint`" ] && find $mntpoint/* -delete +[ -d "$mntpoint" ] && (cd $mntpoint && find . -delete) rm -f /tmp/credleak s=0 @@ -145,8 +145,10 @@ main(int argc, char **argv) { int i, j; - if (argc != 2) - errx(1, "Usage: %s <full path to dir>", argv[0]); + if (argc != 2) { + fprintf(stderr, "Usage: %s <full path to dir>", argv[0]); + exit(1); + } dir = argv[1]; for (j = 0; j < LOOPS; j++) { Modified: user/pho/stress2/misc/crossmp6.sh ============================================================================== --- user/pho/stress2/misc/crossmp6.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/crossmp6.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -63,8 +63,10 @@ if [ $# -eq 0 ]; then wait mount -t nfs -o tcp -o nfsv3 -o retrycnt=1 -o soft,timeout=1 \ -o rw $nfs_export $mntpoint || exit 0 - rm -f /mnt/$0.* + sleep .5 + rm -f $mntpoint/$0.* umount $mntpoint + rm -f $mntpoint*/$0.* exit 0 else if [ $1 = find ]; then Modified: user/pho/stress2/misc/link.sh ============================================================================== --- user/pho/stress2/misc/link.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/link.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -87,6 +87,7 @@ done > /dev/null 2>&1 while mount | grep $mntpoint | grep -q tmpfs; do umount $mntpoint || sleep 1 done +[ -d "$mntpoint" ] && (cd $mntpoint && find . -delete) rm -f /tmp/link exit 0 EOF Modified: user/pho/stress2/misc/mmap2.sh ============================================================================== --- user/pho/stress2/misc/mmap2.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/mmap2.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -45,7 +45,7 @@ start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 600 ]; do ./mmap2 done -rm -f ./mmap2 +rm -f ./mmap2* exit EOF Modified: user/pho/stress2/misc/mmap27.sh ============================================================================== --- user/pho/stress2/misc/mmap27.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/mmap27.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -48,7 +48,7 @@ sleep 2 while pgrep -q swap; do pkill -9 swap done -rm -f ./mmap27 /tmp/mmap27.0* +rm -f ./mmap27 /tmp/mmap27.0* /tmp/mmap27 exit 0 EOF Modified: user/pho/stress2/misc/mmap28.sh ============================================================================== --- user/pho/stress2/misc/mmap28.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/mmap28.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -51,7 +51,7 @@ cd $odir (cd /tmp; ./mmap28) -rm -f /tmp/mmap28 /tmp/mmap28.0* +rm -f /tmp/mmap28 /tmp/mmap28.0* /tmp/mmap28.core exit 0 EOF Modified: user/pho/stress2/misc/pfl.sh ============================================================================== --- user/pho/stress2/misc/pfl.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/pfl.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -91,6 +91,7 @@ mdconfig -d -u $md2 while mount | grep "$mp1 " | grep -q /dev/md; do umount $mp1 || sleep 1 done +rm -f /tmp/pfl mdconfig -d -u $md1 exit Modified: user/pho/stress2/misc/pthread9.sh ============================================================================== --- user/pho/stress2/misc/pthread9.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/pthread9.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -49,6 +49,7 @@ if ping -c 2 `echo $nfs_export | sed 's/ mount -t nfs -o nfsv3,tcp,nolockd,retrycnt=3,intr $nfs_export \ $mntpoint || exit 1 sleep .5 + echo "Expect core dumps" (cd $mntpoint; /tmp/pthread9) & sleep 200 if pgrep -q pthread9; then @@ -60,7 +61,7 @@ if ping -c 2 `echo $nfs_export | sed 's/ wait fi -rm -f /tmp/pthread9 +rm -f /tmp/pthread9 /tmp/pthread9.core exit $status EOF #include <sys/types.h> Modified: user/pho/stress2/misc/rename10.sh ============================================================================== --- user/pho/stress2/misc/rename10.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/rename10.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -73,6 +73,7 @@ while mount | grep "on $mntpoint " | gre done checkfs /dev/md${mdstart}$part +rm -f /tmp/rename10 mdconfig -d -u $mdstart exit 0 EOF Modified: user/pho/stress2/misc/rename7.sh ============================================================================== --- user/pho/stress2/misc/rename7.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/rename7.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -63,7 +63,7 @@ if mount | grep -q md${mdstart}$part; th echo "Test failed" exit 1 fi -rm -d /tmp/rename7 +rm -f /tmp/rename7 exit 0 EOF #include <err.h> Modified: user/pho/stress2/misc/suj10.sh ============================================================================== --- user/pho/stress2/misc/suj10.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/suj10.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -81,7 +81,7 @@ fsck -t ufs -y -v /dev/md${mdstart}$part dumpfs /dev/md${mdstart}$part | grep -v UFS2 > /tmp/dumpfs.2 diff -c /tmp/dumpfs.1 /tmp/dumpfs.2 || cat /tmp/fsck.log mdconfig -d -u $mdstart -rm -f /tmp/fsck.log /tmp/dumpfs.? +rm -f /tmp/fsck.log /tmp/dumpfs.? /tmp/suj10 exit EOF #include <err.h> Modified: user/pho/stress2/misc/symlink.sh ============================================================================== --- user/pho/stress2/misc/symlink.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/symlink.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -80,6 +80,7 @@ for i in "" "-U"; do umount -f ${mntpoint} done +rm -f /tmp/symlink mdconfig -d -u $mdstart exit EOF Modified: user/pho/stress2/misc/symlink2.sh ============================================================================== --- user/pho/stress2/misc/symlink2.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/symlink2.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -71,6 +71,7 @@ for i in "" "-U"; do umount -f ${mntpoint} done +rm -f /tmp/symlink2 $D mdconfig -d -u $mdstart exit EOF Modified: user/pho/stress2/misc/tmpfs9.sh ============================================================================== --- user/pho/stress2/misc/tmpfs9.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/tmpfs9.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -56,7 +56,7 @@ wait while mount | grep $mntpoint | grep -q tmpfs; do umount $mntpoint || sleep 1 done -rm -d /tmp/tmpfs9 +rm -f /tmp/tmpfs9 exit EOF #include <sys/types.h> Modified: user/pho/stress2/misc/truss.sh ============================================================================== --- user/pho/stress2/misc/truss.sh Mon Oct 10 09:54:01 2016 (r306944) +++ user/pho/stress2/misc/truss.sh Mon Oct 10 10:58:18 2016 (r306945) @@ -76,11 +76,11 @@ sleep 2 if pgrep -q ttruss; then echo FAIL ps -lH | grep -v grep | grep ttruss - exit 1 + s=1 fi -rm -rf /tmp/ttruss -exit +rm -rf /tmp/ttruss /tmp/ttruss.core +exit $s EOF #include <sys/param.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610101058.u9AAwIbL029243>