From owner-svn-src-user@freebsd.org  Fri Apr  1 11:32:54 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55321AEB801
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  1 Apr 2016 11:32:54 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F3321DF6;
 Fri,  1 Apr 2016 11:32:53 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u31BWrfN010675;
 Fri, 1 Apr 2016 11:32:53 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u31BWrxt010673;
 Fri, 1 Apr 2016 11:32:53 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201604011132.u31BWrxt010673@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Fri, 1 Apr 2016 11:32:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r297487 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Apr 2016 11:32:54 -0000

Author: pho
Date: Fri Apr  1 11:32:52 2016
New Revision: 297487
URL: https://svnweb.freebsd.org/changeset/base/297487

Log:
  Fix error in loop and cleanup script for md2.sh
  Removed unused "cc" in md8.sh
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  user/pho/stress2/misc/md2.sh
  user/pho/stress2/misc/md8.sh

Modified: user/pho/stress2/misc/md2.sh
==============================================================================
--- user/pho/stress2/misc/md2.sh	Fri Apr  1 09:07:18 2016	(r297486)
+++ user/pho/stress2/misc/md2.sh	Fri Apr  1 11:32:52 2016	(r297487)
@@ -34,20 +34,23 @@
 
 . ../default.cfg
 
-mount | grep "$mntpoint" | grep md${mdstart} > /dev/null && umount $mntpoint
-mdconfig -l | grep md${mdstart} > /dev/null &&  mdconfig -d -u ${mdstart}
+mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint
+[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
 
-mdconfig -a -t malloc -s 256m -u ${mdstart}
+mdconfig -a -t malloc -s 256m -u $mdstart
 
+export RUNDIR=$mntpoint/stressX
+export runRUNTIME=10m
 for i in 1 2; do
-	newfs -O$i -i1024 /dev/md${mdstart} > /dev/null 2>&1
-	mount /dev/md${mdstart} ${mntpoint}
-	df -i $mntpoint
-
-	export RUNDIR=$mntpoint/stressX
-	export runRUNTIME=10m
-	cd ..; ./run.sh
-
-	umount ${mntpoint}
+	echo "newfs -O$i -i1024 /dev/md$mdstart"
+	newfs -O$i -i1024 /dev/md$mdstart > /dev/null 2>&1
+	mount /dev/md$mdstart $mntpoint
+
+	(cd ..; ./run.sh)
+
+	while true; do
+		umount $mntpoint && break
+	done
 done
 mdconfig -d -u $mdstart
+exit 0

Modified: user/pho/stress2/misc/md8.sh
==============================================================================
--- user/pho/stress2/misc/md8.sh	Fri Apr  1 09:07:18 2016	(r297486)
+++ user/pho/stress2/misc/md8.sh	Fri Apr  1 11:32:52 2016	(r297487)
@@ -52,9 +52,7 @@ rm -f /tmp/md8
 mycc -o md8 -Wall -Wextra -g -O2 md8.c || exit 1
 rm -f md8.c
 
-cc -o /tmp/fstool $odir/../tools/fstool.c || exit 1
 cd $odir
-
 trap "rm -f $diskimage" EXIT INT
 dd if=/dev/zero of=$diskimage bs=1m count=50 2>&1 | \
     egrep -v 'records|transferred'