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

[Peter Holm]

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"