Date: Tue, 20 Jun 2017 08:36:07 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r320139 - user/pho/stress2 Message-ID: <201706200836.v5K8a73w026151@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Tue Jun 20 08:36:07 2017 New Revision: 320139 URL: https://svnweb.freebsd.org/changeset/base/320139 Log: Local config overrides the default. Do not run the test when saving the binaries. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/default.cfg Modified: user/pho/stress2/default.cfg ============================================================================== --- user/pho/stress2/default.cfg Tue Jun 20 08:03:50 2017 (r320138) +++ user/pho/stress2/default.cfg Tue Jun 20 08:36:07 2017 (r320139) @@ -6,6 +6,8 @@ # As a minimum you must updated "testuser". hostname=`hostname` # Name of the local configuration file +[ -f "./$hostname" ] && . "./$hostname" # Source in local configuration +[ -f "../$hostname" ] && . "../$hostname" # Source in local configuration # Default values export RUNDIR=${RUNDIR:-/tmp/stressX} @@ -17,7 +19,7 @@ export LOAD=${LOAD:-20} # the amount of RAM in the test box. export INCARNATIONS=${INCARNATIONS:-20} -export BLASTHOST=192.168.1.1 # host with udp discard enabled in inetd.conf +export BLASTHOST=${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: @@ -35,7 +37,7 @@ export rwLOAD=${rwLOAD:-70} export mkdirLOAD=${mkdirLOAD:-80} export creatLOAD=${creatLOAD:-80} -export symlinkLOAD=20} +export symlinkLOAD=${symlinkLOAD:-20} export tcpKILL=1 export shmINCARNATIONS=${shmINCARNATIONS:-5} @@ -113,6 +115,7 @@ mycc () { # "-o" must be first argument echo "Overwriting $STRESS2BIN/$file" echo "cp $2 $STRESS2BIN" cp $2 $STRESS2BIN + exit 0 # Build but do not run the test elif [ "$BMODE" = "2" ]; then [ -z "$file" ] && return if [ ! -x $STRESS2BIN/$file ]; then @@ -125,9 +128,6 @@ mycc () { # "-o" must be first argument $CC $@ # default "build and run" mode fi } - -[ -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." \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706200836.v5K8a73w026151>