From b23a3c993021e0ce6983cd8d99c8da0e2285bc9d Mon Sep 17 00:00:00 2001
From: Lucy Liang <lgliang@linux.vnet.ibm.com>
Date: Mon, 15 Aug 2011 11:56:28 -0700
Subject: [PATCH] Updated pounder's configuration files

Updated libpounder.sh file to reflect changes in the new pounder
version. Added a config file containing user-modifiable environment
variables along with detailed descriptions of what each does.

Signed-off-by: Lucy Liang <lgliang@linux.vnet.ibm.com>
---
 tools/pounder21/config        | 42 +++++++++++++++++++++++++++++++++++
 tools/pounder21/libpounder.sh |  5 ++---
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 tools/pounder21/config

diff --git a/tools/pounder21/config b/tools/pounder21/config
new file mode 100644
index 000000000..69c15dc9d
--- /dev/null
+++ b/tools/pounder21/config
@@ -0,0 +1,42 @@
+#Set the following variables as needed
+
+export DURATION=0			#Time in seconds for pounder to run. Setting this variable
+					#to 0 will not put an upper bound on pounder run time.
+
+export MAX_FAILURES=5			#Maximum number of test failures allowed for each subtest
+					#before aborting. Setting this variable to 0 will not put
+					#an upper bound on any subtest failures.
+
+export NFS_LOGGING=0			#1 to enable NFS logging of pounder output, pounder will
+					#log output to remote directory on NFS server  specified
+					#by $NFS_LOGDIR and  $NFS_LOGSERVER (see below), which
+					#will be mounted on $POUNDER_LOGLOCAL (see libpounder.sh).
+					#0 to disable this feature, all output for pounder runs
+					#will be stored locally directly in $POUNDER_LOGLOCAL instead.
+
+export NFS_LOGSERVER=0			#IP address of the NFS server to use for logging pounder results.
+					#NFS_LOGGING should be enabled to use this feature.
+
+export NFS_LOGDIR=/path/to/log		#path to the log directory on $NFS_LOGSERVER; If $NFS_LOGGING
+					#is enabled, pounder will attempt to mount $NFS_LOGSERVER:$NFS_LOGDIR/
+					#on $POUNDER_LOGLOCAL (see libpounder.sh).
+
+export POUNDER_CACHE=0  		#address of the cache to use for fetching outside packages,
+                        		#The cache is a user-created web-accessible directory
+                        		#containing cached tarballs/scripts/etc. used for
+                        		#the various tests you intend to build. This is optional
+                        		#but useful for saving download time.
+
+#These variables below are used by specific subtests contained in the provided default test scheduler,
+#but they can be incorporated into user-defined subtests as well.
+
+export DO_X_TESTS=0			#0 disables X system testing, 1 enables X system testing.
+					#Used by the xterm_stress subtest.
+
+export NFS_SERVER=0			#IP address of the NFS server to use for nfs and ping_nfs
+					#subtests. Setting this variable to 0 disables nfs testing.
+
+export NTP_SERVER=pool.ntp.org		#Or use another NTP server of your choice.
+					#Used by the time_drift subtest.
+
+#Feel free to add more variables as you see fit.
diff --git a/tools/pounder21/libpounder.sh b/tools/pounder21/libpounder.sh
index 72a0dd61e..54442398e 100644
--- a/tools/pounder21/libpounder.sh
+++ b/tools/pounder21/libpounder.sh
@@ -25,13 +25,12 @@ export TESTS=`/bin/ls test_scripts/`
 export BUILDS=`/bin/ls build_scripts/`
 export POUNDER_HOME=`pwd`
 export POUNDER_PIDFILE="$POUNDER_HOME/pounder.pid"
-export POUNDER_LOGLOCAL="$POUNDER_HOME/log/"
+export POUNDER_LOGLOCAL="$POUNDER_HOME/log"
 export POUNDER_LOGDIR="$POUNDER_LOGLOCAL/$DATE/"
 export POUNDER_TMPDIR="$POUNDER_HOME/tmp/"
 export POUNDER_OPTDIR="$POUNDER_HOME/opt/"
 export POUNDER_SRCDIR="$POUNDER_HOME/src/"
-export POUNDER_CFGDIR="$POUNDER_HOME/config/"
-export POUNDER_VERSION=`head -1 "$POUNDER_HOME/README" | awk -F " " '{print $6}' | sed -e 's/\.//g'`
+export POUNDER_VERSION=`head -1 "$POUNDER_HOME/README" | awk -F " " '{print $3}' | sed -e 's/\.//g'`
 export NR_CPUS=`getconf _NPROCESSORS_ONLN`
 export NFS_LOGLOCAL="`echo "$HOSTNAME" | sed -e 's/\..*//g'`/`uname -r`-`uname -m`"