svn commit: r292866 - user/pho/stress2
Peter Holm
pho at FreeBSD.org
Tue Dec 29 12:08:55 UTC 2015
Author: pho
Date: Tue Dec 29 12:08:54 2015
New Revision: 292866
URL: https://svnweb.freebsd.org/changeset/base/292866
Log:
Make the origin check warning work.
Sponsored by: EMC / Isilon storage division
Modified:
user/pho/stress2/default.cfg
user/pho/stress2/run.sh
Modified: user/pho/stress2/default.cfg
==============================================================================
--- user/pho/stress2/default.cfg Tue Dec 29 11:53:13 2015 (r292865)
+++ user/pho/stress2/default.cfg Tue Dec 29 12:08:54 2015 (r292866)
@@ -61,6 +61,7 @@ testuser=pho # Name of non root test u
mdstart=5 # Start of free md units
part=a # partition to use on a md FS
newfs_flags="-U" # default file system flags
+export stress2origin=${stress2origin:-`pwd`}
# Wrapper for dd
dede () { # file, blocksize, count
Modified: user/pho/stress2/run.sh
==============================================================================
--- user/pho/stress2/run.sh Tue Dec 29 11:53:13 2015 (r292865)
+++ user/pho/stress2/run.sh Tue Dec 29 12:08:54 2015 (r292866)
@@ -41,8 +41,9 @@ while getopts a name; do
done
shift $(($OPTIND - 1))
-pgrep -fq all.sh ||
- echo "Note: all.sh in stress2/misc is the preferred test to run."
+[ `basename ${stress2origin:-X}` != misc ] &&
+ echo "Note: all.sh in stress2/misc is the preferred test to run." \
+ 1>&2
if [ ! -z "$aflag" ]; then
. ./default.cfg
export runRUNTIME=5m
More information about the svn-src-user
mailing list