Index: user/pho/stress2/default.cfg
===================================================================
--- user/pho/stress2/default.cfg	(revision 252545)
+++ user/pho/stress2/default.cfg	(revision 252546)
@@ -1,76 +1,92 @@
 # $FreeBSD$
 
 # Stress Test Suite Configuration
 
 # Default values
 export RUNDIR=${RUNDIR:-/tmp/stressX}
 export RUNTIME=${RUNTIME:-2m}
 export VERBOSE=${VERBOSE:-1}
 export LOAD=20
 
 # The INCARNATIONS variable should be set to match the number of CPUs and
 # the amount of RAM in the test box.
 # 10  for a 1,8 GHz Celeron with 256 Mb of RAM
 # 100 for a dual Xeon 1,8 GHz with 1024 Gb of RAM
 
 export INCARNATIONS=${INCARNATIONS:-20}
 
 # Change hostname!
 #export BLASTHOST=192.168.1.2	# host with udp discard enabled in inetd.conf
 export BLASTHOST=192.168.1.3	# host with udp discard enabled in inetd.conf
 
 
 # Run all test cases:
 export runRUNTIME=${runRUNTIME:-3d}		# Run tests for three days
 export runINCARNATIONS=1
 export runLOAD=100
 
-export swapINCARNATIONS=$((2 * INCARNATIONS))
+export swapINCARNATIONS=${swapINCARNATIONS:-$((2 * INCARNATIONS))}
 export swapLOAD=80
 
 export syscallKILL=1
 
 export rwLOAD=70
 export mkdirLOAD=80
 export creatLOAD=80
 
 export symlinkLOAD=20
 
 export tcpKILL=1
 #export shmKILL=1
 export shmINCARNATIONS=5
 
 export TESTPROGS="
 testcases/rw/rw
 testcases/swap/swap
 testcases/creat/creat
 testcases/mkdir/mkdir
 testcases/thr1/thr1
 testcases/udp/udp
 testcases/tcp/tcp
 "
 
 [ -r default.cfg ] && ulimit -t 200	# Do not run this for the misc sub directory
 
 # 
 # Defaults for ./misc tests
 #
 
 diskimage=/var/tmp/diskimage	# Location of 1G disk image
 mntpoint=/mnt			# Disk image mount point
 testuser=pho			# Name of non root test user
 mdstart=5			# Start of free md units
 part=a				# partitition to use on a md FS
 
 # Wrapper for dd
 dede () {        # file, blocksize, count
    local log=/tmp/$0.$$
    dd if=/dev/zero of=$1 bs=$2 count=$3 > $log 2>&1
    local status=$?
    egrep -v "records in|records out|bytes transferred" $log
    rm -f $log
    return $status 
+}
+
+# fsck and dumpfs comparison
+checkfs () {
+   dumpfs $1 | sed '/UFS2/s/..:..:../xx:xx:xx/' > /tmp/dumpfs.1
+   sleep 1
+   fsck -t ufs -y $1 > /tmp/fsck.log 2>&1
+   dumpfs $1 | sed '/UFS2/s/..:..:../xx:xx:xx/' > /tmp/dumpfs.2
+   if egrep -q "INCONSISTENCY|MODIFIED" /tmp/fsck.log ||
+     ! cmp -s /tmp/dumpfs.1 /tmp/dumpfs.2; then
+      diff -c /tmp/dumpfs.1 /tmp/dumpfs.2
+      echo "fsck -t ufs -y $1"
+      cat /tmp/fsck.log
+   else
+      rm -f /tmp/fsck.log /tmp/dumpfs.[12]
+   fi
 }
 
 [ -f  "./`hostname`" ] && .  "./`hostname`"	# source in local configuration
 [ -f "../`hostname`" ] && . "../`hostname`"	# source in local configuration