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

[Peter Holm]

Author: pho
Date: Tue Dec 29 12:38:04 2015
New Revision: 292869
URL: https://svnweb.freebsd.org/changeset/base/292869

Log:
  Make sure the directory for the $diskimage file exists.
  Added IPC cleanup.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/cleanup.sh

Modified: user/pho/stress2/misc/cleanup.sh
==============================================================================
--- user/pho/stress2/misc/cleanup.sh	Tue Dec 29 12:35:12 2015	(r292868)
+++ user/pho/stress2/misc/cleanup.sh	Tue Dec 29 12:38:04 2015	(r292869)
@@ -37,6 +37,7 @@ mount | grep -q "on $mntpoint " && umoun
 rm -rf ${mntpoint}/stressX*
 rm -f /tmp/.snap/stress2* /var/.snap/stress2*
 rm -rf /tmp/stressX.control $RUNDIR /tmp/misc.name
+[ -d `dirname "$diskimage"` ] || mkdir -p `dirname "$diskimage"`
 mkdir -p $RUNDIR
 chmod 0777 $RUNDIR
 
@@ -59,3 +60,8 @@ for i in `jot $MOUNTS`; do
 	[ -c /dev/md$m ] &&  mdconfig -d -u $m
 	m=$((m + 1))
 done
+
+# Delete $testuser's ipcs
+ipcs | awk "\$5 ~/$testuser/ && \$6 ~/$testuser/ {print \"-\" \$1,\$2}" | \
+    xargs -t ipcrm
+