From owner-svn-src-user@freebsd.org  Tue Dec 29 12:08:55 2015
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 8EB6FA5494B
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 29 Dec 2015 12:08:55 +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 5FB7A123B;
 Tue, 29 Dec 2015 12:08:55 +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 tBTC8sD9013328;
 Tue, 29 Dec 2015 12:08:54 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTC8sXe013326;
 Tue, 29 Dec 2015 12:08:54 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201512291208.tBTC8sXe013326@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: Tue, 29 Dec 2015 12:08:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r292866 - user/pho/stress2
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: <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: Tue, 29 Dec 2015 12:08:55 -0000

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