From owner-svn-src-user@FreeBSD.ORG  Tue May 26 11:15:52 2015
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B01E4940;
 Tue, 26 May 2015 11:15:52 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 85202FA3;
 Tue, 26 May 2015 11:15:52 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4QBFqfS084789;
 Tue, 26 May 2015 11:15:52 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4QBFpuo084786;
 Tue, 26 May 2015 11:15:51 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201505261115.t4QBFpuo084786@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 26 May 2015 11:15:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r283564 - 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.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 May 2015 11:15:52 -0000

Author: pho
Date: Tue May 26 11:15:51 2015
New Revision: 283564
URL: https://svnweb.freebsd.org/changeset/base/283564

Log:
  Only use SU+J if SU is enabled.
  
  Sponsored by:	 EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/trim.sh
  user/pho/stress2/misc/trim3.sh
  user/pho/stress2/misc/trim4.sh

Modified: user/pho/stress2/misc/trim.sh
==============================================================================
--- user/pho/stress2/misc/trim.sh	Tue May 26 11:13:07 2015	(r283563)
+++ user/pho/stress2/misc/trim.sh	Tue May 26 11:15:51 2015	(r283564)
@@ -43,7 +43,9 @@ size="128m"
 [ `uname -m` = "amd64" ] && size="1g"
 [ $# -eq 0 ] && trim=-t
 n=0
-for flag in '' '-U' '-j'; do
+opt=""
+[ "$newfs_flags" = "-U" ] && opt="-U -j"
+for flag in ' ' $opt; do
 	echo "mdconfig -a -t malloc -o reserve -s $size -u $mdstart"
 	mdconfig -a -t malloc -o reserve -s $size -u $mdstart || exit 1
 	bsdlabel -w md$mdstart auto

Modified: user/pho/stress2/misc/trim3.sh
==============================================================================
--- user/pho/stress2/misc/trim3.sh	Tue May 26 11:13:07 2015	(r283563)
+++ user/pho/stress2/misc/trim3.sh	Tue May 26 11:15:51 2015	(r283564)
@@ -41,7 +41,9 @@ mdconfig -l | grep -q md$mdstart &&  mdc
 size="1g"
 [ $# -eq 0 ] && trim=-t
 n=0
-for flag in '' '-U' '-j'; do
+opt=""
+[ "$newfs_flags" = "-U" ] && opt="-U -j"
+for flag in ' ' $opt; do
 	echo "mdconfig -a -t swap -s $size -u $mdstart"
 	mdconfig -a -t swap -s $size -u $mdstart || exit 1
 	bsdlabel -w md$mdstart auto

Modified: user/pho/stress2/misc/trim4.sh
==============================================================================
--- user/pho/stress2/misc/trim4.sh	Tue May 26 11:13:07 2015	(r283563)
+++ user/pho/stress2/misc/trim4.sh	Tue May 26 11:15:51 2015	(r283564)
@@ -40,7 +40,7 @@ mdconfig -l | grep -q md$mdstart &&  mdc
 
 size="1g"
 [ $# -eq 0 ] && trim=-t
-flag="-j"
+[ "$newfs_flags" = "-U" ] && flag="-j"
 for i in `jot 6`; do
 	echo "Test #$i `date '+%T'`"
 	echo "mdconfig -a -t swap -s $size -u $mdstart"