X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=check;h=84eed6ae3ab4c02eb7e2480eb690bc585cacfaa9;hp=926000a86c257a58027012b6f5683fbb5661951d;hb=0b6bf4b67c0c4db8d26c5fdd81c843b907072bc6;hpb=045da6924119d0d8eddac0f30810e36da56241e4;ds=sidebyside

diff --git a/check b/check
index 926000a8..84eed6ae 100755
--- a/check
+++ b/check
@@ -2,7 +2,7 @@
 #
 # Control script for QA
 #
-# Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -64,12 +64,6 @@ _wallclock()
     date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
 }
 
-_timestamp()
-{
-    now=`date "+%D-%T"` 
-    echo -n " [$now]"
-}
-
 _wrapup()
 {
     # for hangcheck ...
@@ -150,47 +144,39 @@ echo "preamble" >/tmp/check.sts
 rm -f check.full
 
 # by default don't output timestamps
-timestamp=false
+timestamp=${TIMESTAMP:=false}
 
 . ./common
 
 [ -f check.time ] || touch check.time
 
-if [ ! -z "$MKFS_OPTIONS" ]
+FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
+echo "MKFS_OPTIONS  -- $FULL_MKFS_OPTIONS"
+umount $SCRATCH_DEV 2>/dev/null
+# call the overridden mkfs.xfs - make sure the FS is built
+# the same as we'll create it later.
+if ! _scratch_mkfs_xfs -f >$tmp.err 2>&1
 then
-    echo "check: \$MKFS_OPTIONS specified - \"$MKFS_OPTIONS\""
-    umount $SCRATCH_DEV 2>/dev/null
-    # call the overridden mkfs.xfs - make sure the FS is built
-    # the same as we'll create it later.
-    if ! mkfs_xfs -f $SCRATCH_DEV >$tmp.err 2>&1
-    then
-	echo "our local mkfs_xfs routine ..."
-	cat $tmp.err
-        echo "check: failed to mkfs.xfs \$SCRATCH_DEV using specified options"
-        exit 1
-    fi
+    echo "our local _scratch_mkfs_xfs routine ..."
+    cat $tmp.err
+    echo "check: failed to mkfs.xfs \$SCRATCH_DEV using specified options"
+    exit 1
 fi
 
-if [ ! -z "$MOUNT_OPTIONS" ]
+FULL_MOUNT_OPTIONS=`_scratch_mount_options`
+echo "MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS"
+# call the overridden mount - make sure the FS mounts with
+# the same options that we'll mount with later.
+if ! _scratch_mount >$tmp.err 2>&1
 then
-    echo "check: \$MOUNT_OPTIONS specified - \"$MOUNT_OPTIONS\""
-    umount $TEST_DEV
-    # call the overridden mount - make sure the FS starts as
-    # the same as we'll set it later.
-    if ! mount -t xfs $TEST_DEV $TEST_DIR >$tmp.err 2>&1
-    then
-	echo "our local mount routine ..."
-	cat $tmp.err
-        # call the normal mount
-	echo "normal mount ..."
-        /bin/mount -t xfs $TEST_DEV $TEST_DIR
-        echo "check: failed to mount \$TEST_DEV using specified mount options"
-        exit 1
-    fi
+    echo "our local mount routine ..."
+    cat $tmp.err
+    echo "check: failed to mount \$SCRATCH_DEV using specified options"
+    exit 1
 fi
 
 seq="check"
-_check_fs $TEST_DEV
+_check_test_fs
 
 for seq in $list
 do
@@ -214,17 +200,21 @@ do
 	#
 	rm -f $seq.out.bad
 	lasttime=`sed -n -e "/^$seq /s/.* //p" <check.time`
-	[ "X$lasttime" != X ] && echo -n " ${lasttime}s ..."
+	if [ "X$lasttime" != X ]; then
+		echo -n " ${lasttime}s ..."
+	else
+		echo -n "	"	# prettier output with timestamps.
+	fi
 	rm -f core $seq.notrun
 
 	# for hangcheck ...
 	echo "$seq" >/tmp/check.sts
 
 	start=`_wallclock`
-	$timestamp && _timestamp
+	$timestamp && echo -n "	["`date "+%T"`"]"
 	sh $seq >$tmp.rawout 2>&1
 	sts=$?
-	$timestamp && _timestamp
+	$timestamp && echo -n " ["`date "+%T"`"]"
 	stop=`_wallclock`
 
 	_fix_malloc <$tmp.rawout >$tmp.out
@@ -239,7 +229,8 @@ do
 
 	if [ -f $seq.notrun ]
 	then
-	    echo -n " [not run] "
+	    $timestamp || echo -n " [not run] "
+	    $timestamp && echo " [not run]" && echo -n "	$seq -- "
 	    cat $seq.notrun
 	    notrun="$notrun $seq"
 	else
@@ -284,7 +275,7 @@ do
     [ -f $seq.notrun ] || try=`expr $try + 1`
     
     seq="after_$seq"
-    _check_fs $TEST_DEV
+    _check_test_fs
     
 done