A bit of a cleanup of common.config and add new QA host.

Merge of master-melb:xfs-cmds:28444a by kenmcd.

common.config

@@ -18,7 +18,7 @@
 # TEST_RTDEV -      test rt dev
 # TAPE_DEV -        the tape device for the xfsdump tests
 # RMT_TAPE_DEV -    the remote tape device for the xfsdump tests
-# RMT_IRIXTAPE_DEV	- the IRIX remote tape device for the xfsdump tests
+# RMT_IRIXTAPE_DEV- the IRIX remote tape device for the xfsdump tests
 # RMT_TAPE_USER -   remote user for tape device
 #
 # - These can be added to known_hosts() below or a separate local
@@ -40,15 +40,15 @@ HOST=`hostname -s`
 HOSTOS=`uname -s`
 [ "$HOSTOS" = "IRIX64" ] && HOSTOS="IRIX"
 
-MODULAR=0		# using XFS as a module or not
+MODULAR=0# using XFS as a module or not
-BOOT="/boot"		# install target for kernels
+BOOT="/boot"# install target for kernels
 export EXTRA=${EXTRA:=xfs-qa}
 
 # general parameters (mainly for auto-qa)
-SOAK_PROC=3		# -p option to fsstress
+SOAK_PROC=3# -p option to fsstress
-SOAK_STRESS=10000	# -n option to fsstress
+SOAK_STRESS=10000# -n option to fsstress
-SOAK_PASSES=-1		# count of repetitions of fsstress (while soaking)
+SOAK_PASSES=-1# count of repetitions of fsstress (while soaking)
-EMAIL=root@localhost	# where auto-qa will send its status messages
+EMAIL=root@localhost# where auto-qa will send its status messages
 export HOST_OPTIONS=${HOST_OPTIONS:=local.config}
 export CHECK_OPTIONS=${CHECK_OPTIONS:="-g auto"}
 export BENCH_PASSES=${BENCH_PASSES:=5}
@@ -63,18 +63,15 @@ export LOCAL_CONFIGURE_OPTIONS=${LOCAL_CONFIGURE_OPTIONS:=--enable-readline=yes}
 set_prog_path()
 {
     p=`which $1 2> /dev/null`
-    if [ -n "$p" -a -x "$p" ]
+    if [ -n "$p" -a -x "$p" ]; then
-    then
         echo $p
         return 0
     fi
     p=$1
     
     shift
-    for f
+    for f; do
-    do
+        if [ -x $f ]; then
-	if [ -x $f ]
-	then
             echo $f
             return 0
         fi
@@ -147,10 +144,9 @@ esac
 
 known_hosts()
 {
-	case "$HOST"
+    case "$HOST" in
-	in
+        vimes)
-	    sheila)
+            # dedicated qa machine, used to be sheila
-		#dedicated qa machine (has some values already set)
             [ -z "$MODULAR" ] && MODULAR=1
             EMAIL="ddiss@sgi.com"
             [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
@@ -295,6 +291,18 @@ known_hosts()
             #RMT_TAPE_DEV=icy:/dev/st0
             #RMT_TAPE_USER=guest
             ;;
+        carrot)
+            #dedicated qa machine, used to be dribble
+            MODULAR=0
+            EMAIL="ddiss@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/dsk/dks0d2s0
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/dsk/dks0d2s6
+            #TAPE_DEV=/dev/tape
+            #RMT_TAPE_DEV=icy:/dev/st0
+            #RMT_TAPE_USER=guest
+            ;;
         giro)
             MODULAR=0
             EMAIL="ddiss@sgi.com"
@@ -450,10 +458,10 @@ known_hosts()
             #RMT_TAPE_DEV=icy:/dev/st0
             #RMT_TAPE_USER=guest
             ;;
-	    porky)
+        nobbs)
-		#dedicated qa machine (has some values already set)
+            #dedicated qa machine, used to be porky
             [ -z "$MODULAR" ] && MODULAR=1
-		EMAIL="ajones@sgi.com"
+            EMAIL="ddiss@sgi.com"
             [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
             [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
             [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
@@ -479,9 +487,6 @@ known_hosts()
             TEST_DEV=/dev/sdb1
             SCRATCH_MNT=/mnt/scratch
             SCRATCH_DEV=/dev/sda6
-		#RMT_IRIXTAPE_DEV=snort:/dev/tape
-		#RMT_TAPE_DEV=icy:/dev/st0
-		#RMT_TAPE_USER=guest
             ;;
         screamer)
             #dedicated qa machine (has some values already set)
@@ -551,6 +556,16 @@ known_hosts()
             [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/xfs_scratch
             [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/xfs_scratch
             ;;
+        growler)
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
+            [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
+            [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
+            ;;
         *)
             echo "Error: need to define parameters for host $HOST"
             exit 1
@@ -565,35 +580,30 @@ else
 fi
 
 echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
-if [ ! -b "$TEST_DEV" -a "$?" != "0" ]
+if [ ! -b "$TEST_DEV" -a "$?" != "0" ]; then
-then
     echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device or a NFS filesystem"
     exit 1
 fi
 
-if [ ! -d "$TEST_DIR" ]
+if [ ! -d "$TEST_DIR" ]; then
-then
     echo "common.config: Error: \$TEST_DIR ($TEST_DIR) is not a directory"
     exit 1
 fi
 
 echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
-if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]
+if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]; then
-then
     echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a block device or a NFS filesystem"
     exit 1
 fi
 
-if [ ! -z "$SCRATCH_MNT" -a ! -d "$SCRATCH_MNT" ]
+if [ ! -z "$SCRATCH_MNT" -a ! -d "$SCRATCH_MNT" ]; then
-then
     echo "common.config: Error: \$SCRATCH_MNT ($SCRATCH_MNT) is not a directory"
     exit 1
 fi
 
 _readlink()
 {
-    if [ $# -ne 1 ]
+    if [ $# -ne 1 ]; then
-    then
         echo "Usage: _readlink filename" 1>&2
         exit 1
     fi