summaryrefslogtreecommitdiff
path: root/common/log
diff options
context:
space:
mode:
Diffstat (limited to 'common/log')
-rw-r--r--common/log36
1 files changed, 18 insertions, 18 deletions
diff --git a/common/log b/common/log
index 727bb6c7..87074d97 100644
--- a/common/log
+++ b/common/log
@@ -20,7 +20,7 @@
# Created by dxm@sgi.com & tes@sgi.com
#
-fulldir=$RESULT_DIR/$seq.fulldir
+fulldir=$seqres.fulldir
rm -rf $fulldir
_cleanup_logfiles()
@@ -33,16 +33,16 @@ _cleanup_logfiles()
_full()
{
- echo "" >>$RESULT_DIR/$seq.full
- echo "*** $* ***" >>$RESULT_DIR/$seq.full
- echo "" >>$RESULT_DIR/$seq.full
+ echo "" >>$seqres.full
+ echo "*** $* ***" >>$seqres.full
+ echo "" >>$seqres.full
}
_echofull()
{
- echo "" | tee -a $RESULT_DIR/$seq.full
- echo "*** $* ***" | tee -a $RESULT_DIR/$seq.full
- echo "" | tee -a $RESULT_DIR/$seq.full
+ echo "" | tee -a $seqres.full
+ echo "*** $* ***" | tee -a $seqres.full
+ echo "" | tee -a $seqres.full
}
# Handle the operations which get split over Log Record
@@ -212,13 +212,13 @@ _filter_logprint()
_check_log()
{
_full "clean_log : xfs_logprint"
- _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full \
+ _scratch_xfs_logprint -t | tee -a $seqres.full \
| head | grep -q "<CLEAN>" || _fail "DIRTY LOG"
}
_print_logstate()
{
- _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full >$tmp.logprint
+ _scratch_xfs_logprint -t | tee -a $seqres.full >$tmp.logprint
if grep -q "<DIRTY>" $tmp.logprint; then
echo "dirty log"
fi
@@ -288,7 +288,7 @@ _mkfs_log()
# mkfs options to append to log size otion can be specified ($*)
export MKFS_OPTIONS="-l size=2000b -l lazy-count=1 $*"
_full "mkfs"
- _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full 2>&1
+ _scratch_mkfs_xfs >>$seqres.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "Cannot mkfs for this test using option specified: $MKFS_OPTIONS"
return 1
@@ -305,7 +305,7 @@ _create_log()
{
# mount the FS
_full "mount"
- _scratch_mount >>$RESULT_DIR/$seq.full 2>&1
+ _scratch_mount >>$seqres.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "mount failed: $MOUNT_OPTIONS"
return 1
@@ -318,7 +318,7 @@ _create_log()
# unmount the FS
_full "umount"
- umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
+ umount $SCRATCH_DEV >>$seqres.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "umount failed"
return 1
@@ -334,7 +334,7 @@ _create_log_sync()
{
# mount the FS
_full " mount"
- _scratch_mount >>$RESULT_DIR/$seq.full 2>&1
+ _scratch_mount >>$seqres.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "mount failed: $MOUNT_OPTIONS"
return 1
@@ -349,7 +349,7 @@ _create_log_sync()
# unmount the FS
_full "umount"
- umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
+ umount $SCRATCH_DEV >>$seqres.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "umount failed"
return 1
@@ -448,21 +448,21 @@ _require_v2log()
{
# test out mkfs to see if it supports "-l version=2"
export MKFS_OPTIONS="-l version=2"
- if ! _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full 2>&1; then
+ if ! _scratch_mkfs_xfs >>$seqres.full 2>&1; then
_notrun "mkfs does not support v2 logs"
fi
# test out mount to see if it mounts a v2 log fs
export MOUNT_OPTIONS="-o logbsize=32k"
- if ! _scratch_mount >>$RESULT_DIR/$seq.full 2>&1; then
+ if ! _scratch_mount >>$seqres.full 2>&1; then
_notrun "mount/kernel does not support v2 logs"
fi
# check after unmount to see if it is clean
# i.e. it is not a 6.5.25 buggy version checking kernel
touch $SCRATCH_MNT/file
- umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
- if _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full \
+ umount $SCRATCH_DEV >>$seqres.full 2>&1
+ if _scratch_xfs_logprint -t | tee -a $seqres.full \
| head | grep -q "<DIRTY>"; then
_notrun "kernel does not support v2 logs"
fi