From owner-svn-src-user@freebsd.org Tue Jun 20 08:36:08 2017 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 DD939D92CE2 for ; Tue, 20 Jun 2017 08:36:08 +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 AEAB8790D6; Tue, 20 Jun 2017 08:36:08 +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 v5K8a7Jq026152; Tue, 20 Jun 2017 08:36:07 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5K8a73w026151; Tue, 20 Jun 2017 08:36:07 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706200836.v5K8a73w026151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 20 Jun 2017 08:36:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r320139 - 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.23 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: Tue, 20 Jun 2017 08:36:09 -0000 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." \