From owner-svn-src-user@freebsd.org  Mon May 29 08:47:37 2017
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 D82BDCF4A52
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 29 May 2017 08:47:37 +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 A7F3370EE5;
 Mon, 29 May 2017 08:47:37 +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 v4T8lab6088766;
 Mon, 29 May 2017 08:47:36 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8laXN088764;
 Mon, 29 May 2017 08:47:36 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705290847.v4T8laXN088764@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: Mon, 29 May 2017 08:47:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r319106 - 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.23
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: Mon, 29 May 2017 08:47:37 -0000

Author: pho
Date: Mon May 29 08:47:36 2017
New Revision: 319106
URL: https://svnweb.freebsd.org/changeset/base/319106

Log:
  Use a larger disk for tests. Added cleanup after test run.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/cmp.sh
==============================================================================
--- user/pho/stress2/misc/cmp.sh	Mon May 29 08:43:15 2017	(r319105)
+++ user/pho/stress2/misc/cmp.sh	Mon May 29 08:47:36 2017	(r319106)
@@ -46,7 +46,7 @@ rm -f cmp.c
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
 
-mdconfig -a -t swap -s 1g -u $mdstart || exit 1
+mdconfig -a -t swap -s 2g -u $mdstart || exit 1
 bsdlabel -w md$mdstart auto
 # Don't use SU due to bogus "out of inodes" messages.
 newfs md${mdstart}$part > /dev/null
@@ -70,6 +70,7 @@ while mount | grep $mntpoint | grep -q /
 	umount $mntpoint || sleep 1
 done
 mdconfig -d -u $mdstart
+[ -d "$mntpoint" ] && (cd $mntpoint && find . -delete)
 
 # tmpfs
 mount -t tmpfs tmpfs $mntpoint
@@ -92,6 +93,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/cmp
 exit 0
 EOF
@@ -168,8 +170,10 @@ main(int argc, char **argv)
 {
 	int i, j;
 
-	if (argc != 2)
-		errx(1, "Usage: %s <fill 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++) {