From owner-svn-src-user@freebsd.org Wed Apr 13 12:05:02 2016 Return-Path: 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 38019B0D3E1 for ; Wed, 13 Apr 2016 12:05:02 +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 129941BFD; Wed, 13 Apr 2016 12:05:02 +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 u3DC51rO027674; Wed, 13 Apr 2016 12:05:01 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3DC510M027673; Wed, 13 Apr 2016 12:05:01 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201604131205.u3DC510M027673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 13 Apr 2016 12:05:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r297920 - 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.21 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2016 12:05:02 -0000 Author: pho Date: Wed Apr 13 12:05:01 2016 New Revision: 297920 URL: https://svnweb.freebsd.org/changeset/base/297920 Log: Do not overwrite pre-defined shell variables. Make sure the test user is defined. Sponsored by: EMC / Isilon Storage Division Modified: user/pho/stress2/default.cfg Modified: user/pho/stress2/default.cfg ============================================================================== --- user/pho/stress2/default.cfg Wed Apr 13 11:58:14 2016 (r297919) +++ user/pho/stress2/default.cfg Wed Apr 13 12:05:01 2016 (r297920) @@ -1,47 +1,46 @@ # $FreeBSD$ -# Stress Test Suite Configuration +# Stress Test Suite Configuration. + +# Changes should be added to a `hostname` file in this directory. +# As a minimum you must updated "testuser". + +hostname=`hostname` # Name of the local configuration file # Default values export RUNDIR=${RUNDIR:-/tmp/stressX} export RUNTIME=${RUNTIME:-2m} export VERBOSE=${VERBOSE:-1} -export LOAD=20 +export LOAD=${LOAD:-20} -# The INCARNATIONS variable should be set to match the number of CPUs and +# The INCARNATIONS variable may be set to match the number of CPUs and # the amount of RAM in the test box. -# 10 for a 1,8 GHz Celeron with 256 Mb of RAM -# 100 for a dual Xeon 1,8 GHz with 1024 Gb of RAM - export INCARNATIONS=${INCARNATIONS:-20} -# Change hostname! -#export BLASTHOST=192.168.1.2 # host with udp discard enabled in inetd.conf -export BLASTHOST=192.168.1.3 # host with udp discard enabled in inetd.conf -#export nfs_export=somehost:mount # Used by nfs tests +export BLASTHOST=192.168.1.1 # host with udp discard enabled in inetd.conf +#export nfs_export=somehost:mount # Used by the NFS tests # Run all test cases: -export runRUNTIME=${runRUNTIME:-3d} # Run tests for three days +export runRUNTIME=${runRUNTIME:-3d} # Run tests for three days export runINCARNATIONS=1 export runLOAD=100 export swapINCARNATIONS=${swapINCARNATIONS:-$((2 * INCARNATIONS))} -export swapLOAD=80 +export swapLOAD=${swapLOAD:-80} export syscallKILL=1 -export swapKILL=1 # May takes a long time to stop +export swapKILL=1 # May takes a long time to stop -export rwLOAD=70 -export mkdirLOAD=80 -export creatLOAD=80 +export rwLOAD=${rwLOAD:-70} +export mkdirLOAD=${mkdirLOAD:-80} +export creatLOAD=${creatLOAD:-80} -export symlinkLOAD=20 +export symlinkLOAD=20} export tcpKILL=1 -#export shmKILL=1 -export shmINCARNATIONS=5 +export shmINCARNATIONS=${shmINCARNATIONS:-5} -export TESTPROGS=" +[ -z "$TESTPROGS" ] && export TESTPROGS=" testcases/rw/rw testcases/swap/swap testcases/creat/creat @@ -55,13 +54,14 @@ testcases/tcp/tcp # Defaults for ./misc tests # -diskimage=/var/tmp/diskimage # Location of 1G disk image -mntpoint=/mnt # Disk image mount point -testuser=pho # Name of non root test user -mdstart=5 # Start of free md units -part=a # partition to use on a md FS -newfs_flags="-U" # default file system flags +export diskimage=${diskimage:-/tmp/diskimage} # Location of 1G disk image +export mntpoint=${mntpoint:-/mnt} # Disk image mount point +export testuser=${testuser:-TBD} # Name of non root test user +export mdstart=${mdstart:-5} # Start of free md units +export part=${part:-a} # Partition to use on a md FS +export newfs_flags=${newfs_flags:-"-U"} # Default file system flags export stress2origin=${stress2origin:-`pwd`} +export stress2tools=`dirname $stress2origin`/tools # Wrapper for dd dede () { # file, blocksize, count @@ -102,7 +102,7 @@ CC=${CC:-cc} top=`dirname $(pwd)` # cwd for the all.sh script STRESS2BIN=${STRESS2BIN:-$top/bin} mycc () { # "-o" must be first argument - local file; + local file [ "$1" = "-o" ] && file=`basename $2` if [ "$BMODE" = "1" ]; then @@ -126,5 +126,9 @@ mycc () { # "-o" must be first argument fi } -[ -f "./`hostname`" ] && . "./`hostname`" # source in local configuration -[ -f "../`hostname`" ] && . "../`hostname`" # source in local configuration +[ -f "./$hostname" ] && . "./$hostname" # Source in local configuration +[ -f "../$hostname" ] && . "../$hostname" # Source in local configuration + +id $testuser > /dev/null 2>&1 || + { echo "Non-root \$testuser \"$testuser\" not found." \ + "Defined in stress2/default.cfg."; exit 1; }