Fixed merge problems

common.config

@@ -1,5 +1,4 @@
 ##/bin/sh
-
 #
 # Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
 # 
@@ -61,7 +60,16 @@
 #   validity or mountedness.
 #
 
+# Warning: don't put freeware before /usr/bsd on IRIX coz you'll
+#          get the wrong hostname and set your system name to -s  :)
+[ -d /usr/bsd ] && PATH=$PATH:/usr/bsd
+[ -d /usr/freeware/bin ] && PATH=$PATH:/usr/freeware/bin
+PATH=".:$PATH"
+
 HOST=`hostname -s`
+HOSTOS=`uname -s`
+[ "$HOSTOS" = "IRIX64" ] && HOSTOS="IRIX"
+
 MODULAR=0		# using XFS as a module or not
 BOOT="/boot"		# install target for kernels
 export EXTRA=${EXTRA:=xfs-qa}
@@ -72,15 +80,101 @@ SOAK_STRESS=10000	# -n option to fsstress
 SOAK_PASSES=-1		# count of repetitions of fsstress (while soaking)
 EMAIL=root@localhost	# where auto-qa will send its status messages
 export HOST_OPTIONS=${HOST_OPTIONS:=local.config}
-export MKFS_OPTIONS=${MKFS_OPTIONS:=-bsize=4096}
-export MOUNT_OPTIONS=${MOUNT_OPTIONS:=-ologbufs=2}
 export CHECK_OPTIONS=${CHECK_OPTIONS:="-g auto"}
 export BENCH_PASSES=${BENCH_PASSES:=5}
+export XFS_MKFS_OPTIONS=${XFS_MKFS_OPTIONS:=-bsize=4096}
+[ "$HOSTOS" == "Linux" ] && export XFS_MOUNT_OPTIONS=${XFS_MOUNT_OPTIONS:=-ologbufs=2}
+export UDF_MKFS_OPTIONS=${UDF_MKFS_OPTIONS}
+export UDF_MOUNT_OPTIONS=${UDF_MOUNT_OPTIONS}
+export NFS_MKFS_OPTIONS=${NFS_MKFS_OPTIONS}
+export NFS_MOUNT_OPTIONS=${NFS_MOUNT_OPTIONS}
 
 #export DEBUG=${DEBUG:=...} # arbitrary CFLAGS really.
 export MALLOCLIB=${MALLOCLIB:=/usr/lib/libefence.a}
 export LOCAL_CONFIGURE_OPTIONS=${LOCAL_CONFIGURE_OPTIONS:=--enable-readline=yes}
 
+# $1 = prog to look for, $2* = default pathnames if not found in $PATH
+set_prog_path()
+{
+    p=`which $1 2> /dev/null`
+    if [ -n "$p" -a -x "$p" ]
+    then
+	echo $p
+	return 0
+    fi
+    p=$1
+
+    shift
+    for f
+    do
+	if [ -x $f ]
+	then
+	    echo $f
+	    return 0
+	fi
+    done
+
+    echo ""
+    return 1
+}
+
+_fatal()
+{
+    echo "$*"
+    status=1
+    exit 1
+}
+
+export MKFS_PROG="`set_prog_path mkfs`"
+[ "$MKFS_PROG" = "" ] && _fatal "mkfs not found"
+
+export AWK_PROG="`set_prog_path awk`"
+[ "$AWK_PROG" = "" ] && _fatal "awk not found"
+
+export MOUNT_PROG="`set_prog_path mount`"
+[ "$MOUNT_PROG" = "" ] && _fatal "mount not found"
+
+export UMOUNT_PROG="`set_prog_path umount`"
+[ "$UMOUNT_PROG" = "" ] && _fatal "umount not found"
+
+export NSLOOKUP_PROG="`set_prog_path nslookup`"
+[ "$NSLOOKUP_PROG" = "" ] && _fatal "nslookup not found"
+
+export PERL_PROG="`set_prog_path perl`"
+[ "$PERL_PROG" = "" ] && _fatal "perl not found"
+
+export SED_PROG="`set_prog_path sed`"
+[ "$SED_PROG" = "" ] && _fatal "sed not found"
+
+export MAKE_PROG="`set_prog_path gmake`"
+[ "$MAKE_PROG" = "" ] && _fatal "gmake not found"
+
+export PS_ALL_FLAGS="-ef"
+
+export DF_PROG="`set_prog_path df`"
+[ "$DF_PROG" = "" ] && _fatal "df not found"
+[ "$HOSTOS" = "Linux" ] && export DF_PROG="$DF_PROG -T"
+
+export XFS_LOGPRINT_PROG="`set_prog_path xfs_logprint`"
+export XFS_REPAIR_PROG="`set_prog_path xfs_repair`"
+export XFS_CHECK_PROG="`set_prog_path xfs_check`"
+export XFS_DB_PROG="`set_prog_path xfs_db`"
+
+case "$HOSTOS" in
+    IRIX*)
+	   export MKFS_XFS_PROG="`set_prog_path mkfs_xfs`"
+	   export MKFS_UDF_PROG="`set_prog_path mkfs_udf`" 
+	   export XFS_FSR_PROG="`set_prog_path /usr/etc/fsr_xfs`"
+	   export MKFS_NFS_PROG="false" 
+	   ;;
+    Linux)
+	   export MKFS_XFS_PROG="`set_prog_path mkfs.xfs`"
+	   export MKFS_UDF_PROG="`set_prog_path mkfs.udf`"
+	   export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
+	   export MKFS_NFS_PROG="false" 
+	   ;;
+esac
+
 known_hosts()
 {
 	case "$HOST"
@@ -229,14 +323,15 @@ known_hosts()
 }
 
 if [ -f "$HOST_OPTIONS" ]; then
-    source "$HOST_OPTIONS"
+    . ./"$HOST_OPTIONS"
 else
     known_hosts
 fi
 
-if [ ! -b "$TEST_DEV" ]
+echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
+if [ ! -b "$TEST_DEV" -a "$?" != "0" ]
 then
-    echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device"
+    echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device or a NFS filesystem"
     exit 1
 fi
 
@@ -246,13 +341,14 @@ then
     exit 1
 fi
 
-if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" ]
+echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
+if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]
 then
-    echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a block device"
+    echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a block device or a NFS filesystem"
     exit 1
 fi
 
-if [ ! -z "$SCRATCH_DEV" -a ! -d "$SCRATCH_MNT" ]
+if [ ! -z "$SCRATCH_MNT" -a ! -d "$SCRATCH_MNT" ]
 then
     echo "common.config: Error: \$SCRATCH_MNT ($SCRATCH_MNT) is not a directory"
     exit 1