diff options
author | Dave Chinner <dchinner@redhat.com> | 2013-03-15 12:28:02 +0000 |
---|---|---|
committer | Rich Johnston <rjohnston@sgi.com> | 2013-03-26 21:38:47 -0500 |
commit | 1d5d46db80370172750ab0c45ead3991c53678ef (patch) | |
tree | 7b7ad99949a06f839dfc0fa9c1d94c64aed26e05 /tests/xfs | |
parent | 1686f9abfceabd97b1ee52f6bd3060b24f2537d6 (diff) |
xfstests: convert tests to use new results directory
Essentially the change is simply this. Converting:
... >> $seq.????
to:
.... >> $RESULT_DIR/$seq.????
so that output files are directed to the defined output directory.
sed to the rescue:
$ sed -i -e '/^seq=.*$/a seqres=$RESULT_DIR/$seq' -e 's/seq.full/seqres.full/' tests/*/*
will do most of the work automatically.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Phil White <pwhite@sgi.com>
[rjohnston@sgi.com reworked for TOT changes]
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
Diffstat (limited to 'tests/xfs')
179 files changed, 894 insertions, 357 deletions
diff --git a/tests/xfs/003 b/tests/xfs/003 index 79b6bc51..1d44b93c 100755 --- a/tests/xfs/003 +++ b/tests/xfs/003 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" # get standard environment, filters and checks diff --git a/tests/xfs/004 b/tests/xfs/004 index d75c3c0e..076fc4b8 100755 --- a/tests/xfs/004 +++ b/tests/xfs/004 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -39,8 +42,8 @@ trap "_cleanup" 0 1 2 3 15 _populate_scratch() { - echo "=== mkfs output ===" >>$seq.full - _scratch_mkfs_xfs | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs + echo "=== mkfs output ===" >>$seqres.full + _scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs . $tmp.mkfs _scratch_mount dd if=/dev/zero of=$SCRATCH_MNT/foo count=200 bs=4096 >/dev/null 2>&1 & @@ -64,7 +67,7 @@ _need_to_be_root _require_scratch _require_no_large_scratch_dev -rm -f $seq.full +rm -f $seqres.full _populate_scratch @@ -72,16 +75,16 @@ _populate_scratch eval `$DF_PROG $SCRATCH_MNT 2>&1 \ | tail -1 | $AWK_PROG '{ printf "blocks=%u used=%u avail=%u\n", $3, $4, $5 }'` -echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seq.full -echo "blocksize from mkfs is '$dbsize'" >>$seq.full +echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seqres.full +echo "blocksize from mkfs is '$dbsize'" >>$seqres.full xfs_db -r -c "freesp -s" $SCRATCH_DEV >$tmp.xfs_db -echo "xfs_db for $SCRATCH_DEV" >>$seq.full -cat $tmp.xfs_db >>$seq.full +echo "xfs_db for $SCRATCH_DEV" >>$seqres.full +cat $tmp.xfs_db >>$seqres.full eval `$XFS_IO_PROG -x -c resblks $SCRATCH_MNT 2>&1 \ | $AWK_PROG '/available/ { printf "resblks=%u\n", $5 }'` -echo "resblks gave: resblks=$resblks" >>$seq.full +echo "resblks gave: resblks=$resblks" >>$seqres.full # check the 'blocks' field from freesp command is OK # since 2.6.18, df does not report the 4 blocks per AG that cannot diff --git a/tests/xfs/008 b/tests/xfs/008 index 0dee9f50..be372021 100755 --- a/tests/xfs/008 +++ b/tests/xfs/008 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/009 b/tests/xfs/009 index 1883f15f..7528f345 100755 --- a/tests/xfs/009 +++ b/tests/xfs/009 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/012 b/tests/xfs/012 index 10498d58..8cd0e7dd 100755 --- a/tests/xfs/012 +++ b/tests/xfs/012 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/016 b/tests/xfs/016 index 538ba14c..20ea752e 100755 --- a/tests/xfs/016 +++ b/tests/xfs/016 @@ -36,6 +36,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -72,7 +75,7 @@ _init() if _scratch_mkfs_xfs -N -K $force_opts >/dev/null 2>&1; then force_opts="-K $force_opts" fi - echo mkfs_xfs $force_opts $SCRATCH_DEV >>$seq.full + echo mkfs_xfs $force_opts $SCRATCH_DEV >>$seqres.full _scratch_mkfs_xfs $force_opts >$tmp.mkfs0 2>&1 [ $? -ne 0 ] && \ _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified" @@ -163,8 +166,8 @@ _check_corrupt() { f="c6c6c6c6" echo "*** check for corruption" - echo "expect $f..." >>$seq.full - xfs_db -r -c "fsblock $2" -c "print" $1 | head | tee -a $seq.full | \ + echo "expect $f..." >>$seqres.full + xfs_db -r -c "fsblock $2" -c "print" $1 | head | tee -a $seqres.full | \ grep -q -v "$f $f $f $f $f $f $f $f" && \ _fail "!!! block $2 corrupted!" } @@ -177,7 +180,7 @@ _check_corrupt() _supported_fs xfs _supported_os Linux -rm -f $seq.full +rm -f $seqres.full # mkfs sizes log_size=2097152 @@ -187,15 +190,15 @@ _require_scratch _init block=`_after_log $SCRATCH_DEV` -echo "fsblock after log = $block" >>$seq.full +echo "fsblock after log = $block" >>$seqres.full _check_corrupt $SCRATCH_DEV $block actual_log_size=`_log_size` -echo "log size = $actual_log_size BB" >>$seq.full +echo "log size = $actual_log_size BB" >>$seqres.full head=`_log_head` -echo "log position = $head" >>$seq.full +echo "log position = $head" >>$seqres.full lsunit=`_log_sunit` -echo "log sunit = $lsunit" >>$seq.full +echo "log sunit = $lsunit" >>$seqres.full # sanity checks [ $actual_log_size -eq $log_size_bb ] || \ @@ -206,36 +209,36 @@ echo "log sunit = $lsunit" >>$seq.full # find how how many blocks per op for 100 ops # ignore the fact that it will also include an unmount record etc... # this should be small overall -echo " lots of traffic for sampling" >>$seq.full +echo " lots of traffic for sampling" >>$seqres.full sample_size_ops=100 _log_traffic $sample_size_ops head1=`_log_head` num_blocks=`expr $head1 - $head` blocks_per_op=`echo "scale=3; $num_blocks / $sample_size_ops" | bc` -echo "blocks_per_op = $blocks_per_op" >>$seq.full +echo "blocks_per_op = $blocks_per_op" >>$seqres.full num_expected_ops=`echo "$log_size_bb / $blocks_per_op" | bc` -echo "num_expected_ops = $num_expected_ops" >>$seq.full +echo "num_expected_ops = $num_expected_ops" >>$seqres.full num_expected_to_go=`echo "$num_expected_ops - $sample_size_ops" | bc` -echo "num_expected_to_go = $num_expected_to_go" >>$seq.full +echo "num_expected_to_go = $num_expected_to_go" >>$seqres.full -echo " lots more traffic" >>$seq.full +echo " lots more traffic" >>$seqres.full _log_traffic $num_expected_to_go head=`_log_head` -echo "log position = $head" >>$seq.full +echo "log position = $head" >>$seqres.full # e.g. 3891 near_end_min=`echo "0.95 * $log_size_bb" | bc | sed 's/\..*//'` -echo "near_end_min = $near_end_min" >>$seq.full +echo "near_end_min = $near_end_min" >>$seqres.full [ $head -gt $near_end_min -a $head -lt $log_size_bb ] || \ _fail "!!! unexpected near end log position $head" for c in `seq 0 20` do - echo " little traffic" >>$seq.full + echo " little traffic" >>$seqres.full _log_traffic 2 head=`_log_head` - echo "log position = $head" >>$seq.full + echo "log position = $head" >>$seqres.full _check_corrupt $SCRATCH_DEV $block done diff --git a/tests/xfs/017 b/tests/xfs/017 index 2b91b33f..4ab1dc2b 100755 --- a/tests/xfs/017 +++ b/tests/xfs/017 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -52,13 +55,13 @@ _require_no_large_scratch_dev echo "*** init FS" -rm -f $seq.full +rm -f $seqres.full umount $SCRATCH_DEV >/dev/null 2>&1 -echo "*** MKFS ***" >>$seq.full -echo "" >>$seq.full -_scratch_mkfs_xfs >>$seq.full 2>&1 \ +echo "*** MKFS ***" >>$seqres.full +echo "" >>$seqres.full +_scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seq.full 2>&1 \ +_scratch_mount >>$seqres.full 2>&1 \ || _fail "mount failed" echo "*** test" @@ -67,21 +70,21 @@ for l in 0 1 2 3 4 do echo " *** test $l" FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -n 1000 $FSSTRESS_AVOID` - $FSSTRESS_PROG $FSSTRESS_ARGS >>$seq.full + $FSSTRESS_PROG $FSSTRESS_ARGS >>$seqres.full _scratch_mount -o remount,ro \ || _fail "remount ro failed" - echo "" >>$seq.full - echo "*** xfs_logprint ***" >>$seq.full - echo "" >>$seq.full - _scratch_xfs_logprint -tb | tee -a $seq.full \ + echo "" >>$seqres.full + echo "*** xfs_logprint ***" >>$seqres.full + echo "" >>$seqres.full + _scratch_xfs_logprint -tb | tee -a $seqres.full \ | head | grep -q "<CLEAN>" || _fail "DIRTY LOG" - echo "" >>$seq.full - echo "*** XFS_CHECK ***" >>$seq.full - echo "" >>$seq.full - _scratch_xfs_check >>$seq.full 2>&1 \ + echo "" >>$seqres.full + echo "*** XFS_CHECK ***" >>$seqres.full + echo "" >>$seqres.full + _scratch_xfs_check >>$seqres.full 2>&1 \ || _fail "xfs_check failed" _scratch_mount -o remount,rw \ || _fail "remount rw failed" @@ -89,6 +92,6 @@ done echo "*** done" # happy exit -rm -f $seq.full +rm -f $seqres.full status=0 exit 0 diff --git a/tests/xfs/018 b/tests/xfs/018 index 156cc1df..d684ccd7 100755 --- a/tests/xfs/018 +++ b/tests/xfs/018 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -47,7 +50,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fs xfs _supported_os IRIX Linux # prelim -rm -f $seq.full $tmp.* +rm -f $seqres.full $tmp.* _require_scratch _require_v2log diff --git a/tests/xfs/019 b/tests/xfs/019 index 3bedc054..4f5916b1 100755 --- a/tests/xfs/019 +++ b/tests/xfs/019 @@ -23,11 +23,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -seqfull="$seq.full" +seqfull="$seqres.full" status=1 # failure is the default! # get standard environment, filters and checks . ./common.rc diff --git a/tests/xfs/021 b/tests/xfs/021 index 18fe40e7..d9fa4f47 100755 --- a/tests/xfs/021 +++ b/tests/xfs/021 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -78,7 +81,7 @@ _supported_os Linux _require_scratch _require_attrs -rm -f $seq.full +rm -f $seqres.full umount $SCRATCH_DEV >/dev/null 2>&1 echo "*** mkfs" @@ -124,7 +127,7 @@ echo "" inum_2=`ls -li $testfile.2 | $AWK_PROG '{ print $1 }'` echo "*** unmount FS" -umount $SCRATCH_DEV >>$seq.full 2>&1 \ +umount $SCRATCH_DEV >>$seqres.full 2>&1 \ || _fail "umount failed" echo "*** dump attributes (1)" diff --git a/tests/xfs/022 b/tests/xfs/022 index 962316fd..a733f5b8 100755 --- a/tests/xfs/022 +++ b/tests/xfs/022 @@ -26,6 +26,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/023 b/tests/xfs/023 index 3e7fdd2f..9cea5a79 100755 --- a/tests/xfs/023 +++ b/tests/xfs/023 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/024 b/tests/xfs/024 index b7f1c101..ee1339ca 100755 --- a/tests/xfs/024 +++ b/tests/xfs/024 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -42,11 +45,11 @@ _require_tape $TAPE_DEV _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2 -src/bstat $SCRATCH_MNT >>$here/$seq.full +src/bstat $SCRATCH_MNT >>$here/$seqres.full _erase_hard _do_dump _append_dumpdir_fill -src/bstat $SCRATCH_MNT >>$here/$seq.full +src/bstat $SCRATCH_MNT >>$here/$seqres.full _erase_hard _do_dump -l 1 _do_restore diff --git a/tests/xfs/025 b/tests/xfs/025 index 4ccb5dea..5a3b0bc7 100755 --- a/tests/xfs/025 +++ b/tests/xfs/025 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/026 b/tests/xfs/026 index 37a23ccf..73feb6b7 100755 --- a/tests/xfs/026 +++ b/tests/xfs/026 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/027 b/tests/xfs/027 index 772705d0..71ca7f39 100755 --- a/tests/xfs/027 +++ b/tests/xfs/027 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/028 b/tests/xfs/028 index 0bf042f8..acbbcd5a 100755 --- a/tests/xfs/028 +++ b/tests/xfs/028 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -59,7 +62,7 @@ while [ $i -lt 5 ]; do let i=$i+1 done -echo "middate = $middate" >>$seq.full +echo "middate = $middate" >>$seqres.full # # Now do the xfsinvutil and diff --git a/tests/xfs/029 b/tests/xfs/029 index 70c0d10f..83dddb44 100755 --- a/tests/xfs/029 +++ b/tests/xfs/029 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/030 b/tests/xfs/030 index 080d3fe4..4918ef29 100755 --- a/tests/xfs/030 +++ b/tests/xfs/030 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/031 b/tests/xfs/031 index 422a2712..467638fe 100755 --- a/tests/xfs/031 +++ b/tests/xfs/031 @@ -23,13 +23,16 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 -rm -f $seq.full +rm -f $seqres.full # get standard environment, filters and checks . ./common.rc @@ -41,15 +44,15 @@ _link_out_file $seq.out _check_repair() { - echo "Repairing, round 0" >> $seq.full - _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seq.full >$tmp.0 + echo "Repairing, round 0" >> $seqres.full + _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seqres.full >$tmp.0 for i in 1 2 3 4 do - echo "Repairing, iteration $i" | tee -a $seq.full + echo "Repairing, iteration $i" | tee -a $seqres.full _scratch_xfs_repair 2>&1 | _filter_repair >$tmp.$i - diff $tmp.0 $tmp.$i >> $seq.full + diff $tmp.0 $tmp.$i >> $seqres.full if [ $? -ne 0 ]; then - echo "ERROR: repair round $i differs to round 0 (see $seq.full)" | tee -a $seq.full + echo "ERROR: repair round $i differs to round 0 (see $seqres.full)" | tee -a $seqres.full break fi # echo all interesting stuff... diff --git a/tests/xfs/033 b/tests/xfs/033 index dc5a32db..208ed8f8 100755 --- a/tests/xfs/033 +++ b/tests/xfs/033 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/034 b/tests/xfs/034 index 27f3f222..46e65a01 100755 --- a/tests/xfs/034 +++ b/tests/xfs/034 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -50,13 +53,13 @@ _require_scratch echo "*** init FS" -rm -f $seq.full +rm -f $seqres.full umount $SCRATCH_DEV >/dev/null 2>&1 -echo "*** MKFS ***" >>$seq.full -echo "" >>$seq.full -_scratch_mkfs_xfs >>$seq.full 2>&1 \ +echo "*** MKFS ***" >>$seqres.full +echo "" >>$seqres.full +_scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seq.full 2>&1 \ +_scratch_mount >>$seqres.full 2>&1 \ || _fail "mount failed" echo "*** test" @@ -69,7 +72,7 @@ then exit fi -if ! src/xfsctl $SCRATCH_MNT $SCRATCH_MNT/fish >>$seq.full 2>&1 +if ! src/xfsctl $SCRATCH_MNT $SCRATCH_MNT/fish >>$seqres.full 2>&1 then echo "!!! failed to run xfsctl test program" exit diff --git a/tests/xfs/035 b/tests/xfs/035 index b2fc4176..bec87ca2 100755 --- a/tests/xfs/035 +++ b/tests/xfs/035 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/036 b/tests/xfs/036 index e9bb4112..056ce990 100755 --- a/tests/xfs/036 +++ b/tests/xfs/036 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/037 b/tests/xfs/037 index e2e71c5c..e2b193a4 100755 --- a/tests/xfs/037 +++ b/tests/xfs/037 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/038 b/tests/xfs/038 index b62a4c95..217fa6f1 100755 --- a/tests/xfs/038 +++ b/tests/xfs/038 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/039 b/tests/xfs/039 index 428e8bbf..d5982f09 100755 --- a/tests/xfs/039 +++ b/tests/xfs/039 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/040 b/tests/xfs/040 index 0021c227..a6e98e3a 100755 --- a/tests/xfs/040 +++ b/tests/xfs/040 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -49,9 +52,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here cd "$WORKAREA/xfstests" echo Silence is golden. -perl tools/srcdiff -q >$seq.full -if ! diff $seq.full $seq.good >/dev/null; then - echo "FAILED: srcdiff output $seq.full differs to $seq.good" +perl tools/srcdiff -q >$seqres.full +if ! diff $seqres.full $seq.good >/dev/null; then + echo "FAILED: srcdiff output $seqres.full differs to $seq.good" exit 1 fi diff --git a/tests/xfs/041 b/tests/xfs/041 index a9a9a232..aa73245b 100755 --- a/tests/xfs/041 +++ b/tests/xfs/041 @@ -25,6 +25,9 @@ set +x seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -59,7 +62,7 @@ _fill() } _do_die_on_error=message_only -rm -f $seq.full +rm -f $seqres.full agsize=32 echo -n "Make $agsize megabyte filesystem on SCRATCH_DEV and mount... " _scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 >/dev/null || _fail "mkfs failed" @@ -84,7 +87,7 @@ do echo "done" echo -n "Check files... " if ! _do "src/fill2fs_check $tmp.manifest"; then - echo "fail (see $seq.full)" + echo "fail (see $seqres.full)" _do "cat $tmp.manifest" _do "ls -altrR $SCRATCH_MNT" _do "dd if=$SCRATCH_DEV bs=4096 count=$grow_size | gzip -9 > $seq.fsimage.gz" diff --git a/tests/xfs/042 b/tests/xfs/042 index 15fa5dc4..5a60da16 100755 --- a/tests/xfs/042 +++ b/tests/xfs/042 @@ -26,6 +26,9 @@ set +x seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -86,7 +89,7 @@ _cull_files() # create 3 minimum sized (16Mb) allocation groups # xfs_repair is going to need three to verify the superblock -rm -f $seq.full +rm -f $seqres.full _do_die_on_error=message_only echo -n "Make a 48 megabyte filesystem on SCRATCH_DEV and mount... " @@ -147,7 +150,7 @@ echo -n "Check fill file... " _do "sum $SCRATCH_MNT/fill >$tmp.fillsum2" if ! _do "diff $tmp.fillsum1 $tmp.fillsum2"; then echo "fail" - echo "Fill file is corrupt/missing after fsr. Test failed see $seq.full" + echo "Fill file is corrupt/missing after fsr. Test failed see $seqres.full" status=1; exit fi echo "done" @@ -157,7 +160,7 @@ echo -n "Check large file... " _do "sum $SCRATCH_MNT/fragmented >$tmp.sum2" if ! _do "diff $tmp.sum1 $tmp.sum2"; then echo "fail" - echo "File is corrupt/missing after fsr. Test failed see $seq.full" + echo "File is corrupt/missing after fsr. Test failed see $seqres.full" status=1; exit fi echo "done" diff --git a/tests/xfs/043 b/tests/xfs/043 index ef92c0a7..35b195b1 100755 --- a/tests/xfs/043 +++ b/tests/xfs/043 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/044 b/tests/xfs/044 index d0d8bd8e..369454c3 100755 --- a/tests/xfs/044 +++ b/tests/xfs/044 @@ -27,6 +27,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/045 b/tests/xfs/045 index c20e3a8f..c8e19a43 100755 --- a/tests/xfs/045 +++ b/tests/xfs/045 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/046 b/tests/xfs/046 index fb83b7a8..1420a3f8 100755 --- a/tests/xfs/046 +++ b/tests/xfs/046 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/047 b/tests/xfs/047 index 7c5e8960..4891c6c3 100755 --- a/tests/xfs/047 +++ b/tests/xfs/047 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -59,7 +62,7 @@ while [ $i -lt 5 ]; do let i=$i+1 done -echo "middate = $middate" >>$seq.full +echo "middate = $middate" >>$seqres.full # Only say No to 1st question to prune cat >$tmp.input <<EOF diff --git a/tests/xfs/048 b/tests/xfs/048 index 6139361b..30e16eec 100755 --- a/tests/xfs/048 +++ b/tests/xfs/048 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/049 b/tests/xfs/049 index 144cc719..8591c367 100755 --- a/tests/xfs/049 +++ b/tests/xfs/049 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" _cleanup() @@ -32,10 +35,10 @@ _cleanup() umount -d $SCRATCH_MNT/test > /dev/null 2>&1 rm -f $tmp.* - if [ -w $seq.full ] + if [ -w $seqres.full ] then - echo "--- mounts at end (after cleanup)" >> $seq.full - mount >> $seq.full + echo "--- mounts at end (after cleanup)" >> $seqres.full + mount >> $seqres.full fi } @@ -55,7 +58,7 @@ _supported_os Linux _log() { echo "--- $*" - echo "--- $*" >> $seq.full + echo "--- $*" >> $seqres.full } _require_nonexternal @@ -64,75 +67,75 @@ _require_no_large_scratch_dev _require_loop _require_ext2 -rm -f $seq.full +rm -f $seqres.full -echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seq.full -echo "" >> $seq.full +echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seqres.full +echo "" >> $seqres.full -echo "--- mounts" >> $seq.full -mount >> $seq.full +echo "--- mounts" >> $seqres.full +mount >> $seqres.full _log "Create ext2 fs on scratch" -mkfs -t ext2 -F $SCRATCH_DEV >> $seq.full 2>&1 \ +mkfs -t ext2 -F $SCRATCH_DEV >> $seqres.full 2>&1 \ || _fail "!!! failed to mkfs ext2" _log "Mount ext2 fs on scratch" -mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seq.full 2>&1 \ +mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seqres.full 2>&1 \ || _fail "!!! failed to mount" _log "Create xfs fs in file on scratch" ${MKFS_PROG}.xfs -f -dfile,name=$SCRATCH_MNT/test.xfs,size=40m \ - >> $seq.full 2>&1 \ + >> $seqres.full 2>&1 \ || _fail "!!! failed to mkfs xfs" _log "Make mount points" -mkdir $SCRATCH_MNT/test $SCRATCH_MNT/test2 >> $seq.full 2>&1 \ +mkdir $SCRATCH_MNT/test $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \ || _fail "!!! failed to make mount points" _log "Mount xfs via loop" -mount -t xfs -o loop $SCRATCH_MNT/test.xfs $SCRATCH_MNT/test >> $seq.full 2>&1 \ +mount -t xfs -o loop $SCRATCH_MNT/test.xfs $SCRATCH_MNT/test >> $seqres.full 2>&1 \ || _fail "!!! failed to loop mount xfs" _log "stress" -$FSSTRESS_PROG -d $SCRATCH_MNT/test -n 1000 $FSSTRESS_AVOID >> $seq.full 2>&1 \ +$FSSTRESS_PROG -d $SCRATCH_MNT/test -n 1000 $FSSTRESS_AVOID >> $seqres.full 2>&1 \ || _fail "!!! stress failed" _log "clean" -rm -rf $SCRATCH_MNT/test/* >> $seq.full 2>&1 \ +rm -rf $SCRATCH_MNT/test/* >> $seqres.full 2>&1 \ || _fail "!!! clean failed" _log "create file for ext2 fs" -dd if=/dev/zero of=$SCRATCH_MNT/test/test.ext2 bs=1024 count=10240 >> $seq.full 2>&1 \ +dd if=/dev/zero of=$SCRATCH_MNT/test/test.ext2 bs=1024 count=10240 >> $seqres.full 2>&1 \ || _fail "!!! create file failed" _log "Create ext2 fs in file on looped xfs" -echo y | mkfs -t ext2 $SCRATCH_MNT/test/test.ext2 >> $seq.full 2>&1 \ +echo y | mkfs -t ext2 $SCRATCH_MNT/test/test.ext2 >> $seqres.full 2>&1 \ || _fail "!!! failed to mkfs ext2 on xfs" _log "Mount ext2 on xfs via loop" -mount -t ext2 -o loop $SCRATCH_MNT/test/test.ext2 $SCRATCH_MNT/test2 >> $seq.full 2>&1 \ +mount -t ext2 -o loop $SCRATCH_MNT/test/test.ext2 $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \ || _fail "!!! failed to loop mount xfs" _log "stress ext2 on xfs via loop" -$FSSTRESS_PROG -d $SCRATCH_MNT/test2 -n 1000 $FSSTRESS_AVOID >> $seq.full 2>&1 \ +$FSSTRESS_PROG -d $SCRATCH_MNT/test2 -n 1000 $FSSTRESS_AVOID >> $seqres.full 2>&1 \ || _fail "!!! stress ext2 failed" _log "clean" -rm -rf $SCRATCH_MNT/test/* >> $seq.full 2>&1 \ +rm -rf $SCRATCH_MNT/test/* >> $seqres.full 2>&1 \ || _fail "!!! clean failed" _log "umount ext2 on xfs" -umount -d $SCRATCH_MNT/test2 >> $seq.full 2>&1 \ +umount -d $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \ || _fail "!!! umount ext2 failed" _log "umount xfs" -umount -d $SCRATCH_MNT/test >> $seq.full 2>&1 \ +umount -d $SCRATCH_MNT/test >> $seqres.full 2>&1 \ || _fail "!!! umount xfs failed" -echo "--- mounts at end (before cleanup)" >> $seq.full -mount >> $seq.full +echo "--- mounts at end (before cleanup)" >> $seqres.full +mount >> $seqres.full -rm -f $seq.full +rm -f $seqres.full # success, all done status=0 exit diff --git a/tests/xfs/050 b/tests/xfs/050 index 29c103b7..d5da34a9 100755 --- a/tests/xfs/050 +++ b/tests/xfs/050 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -49,8 +52,8 @@ _supported_fs xfs _supported_os Linux IRIX -cp /dev/null $seq.full -chmod a+rwx $seq.full # arbitrary users will write here +cp /dev/null $seqres.full +chmod a+rwx $seqres.full # arbitrary users will write here _require_scratch _require_xfs_quota @@ -100,7 +103,7 @@ _filter_and_check_blks() _exercise() { _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs - cat $tmp.mkfs >>$seq.full + cat $tmp.mkfs >>$seqres.full # keep the blocksize and data size for dd later . $tmp.mkfs @@ -117,20 +120,20 @@ _exercise() _qsetup - echo "Using output from '" `ls -l $seq.out` "'" >>$seq.full - echo "and using type=$type id=$id" >>$seq.full + echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full + echo "and using type=$type id=$id" >>$seqres.full echo - echo "*** report no quota settings" | tee -a $seq.full + echo "*** report no quota settings" | tee -a $seqres.full xfs_quota -D $tmp.projects -P $tmp.projid -x \ -c "repquota -birnN -$type" $SCRATCH_DEV | _filter_report | LC_COLLATE=POSIX sort -ru echo - echo "*** report initial settings" | tee -a $seq.full + echo "*** report initial settings" | tee -a $seqres.full _file_as_id $SCRATCH_MNT/initme $id $type 1024 0 - echo "ls -l $SCRATCH_MNT" >>$seq.full - ls -l $SCRATCH_MNT >>$seq.full + echo "ls -l $SCRATCH_MNT" >>$seqres.full + ls -l $SCRATCH_MNT >>$seqres.full xfs_quota -D $tmp.projects -P $temp.projid -x \ -c "limit -$type bsoft=${bsoft}k bhard=${bhard}k $id" \ -c "limit -$type isoft=$isoft ihard=$ihard $id" \ @@ -140,7 +143,7 @@ _exercise() _filter_report | LC_COLLATE=POSIX sort -ru echo - echo "*** push past the soft inode limit" | tee -a $seq.full + echo "*** push past the soft inode limit" | tee -a $seqres.full _file_as_id $SCRATCH_MNT/softie1 $id $type 1024 0 _file_as_id $SCRATCH_MNT/softie2 $id $type 1024 0 _qmount @@ -149,7 +152,7 @@ _exercise() _filter_report | LC_COLLATE=POSIX sort -ru echo - echo "*** push past the soft block limit" | tee -a $seq.full + echo "*** push past the soft block limit" | tee -a $seqres.full _file_as_id $SCRATCH_MNT/softie $id $type 1024 140 _qmount xfs_quota -D $tmp.projects -P $tmp.projid -x \ @@ -158,7 +161,7 @@ _exercise() echo # Note: for quota accounting (not enforcement), EDQUOT is not expected - echo "*** push past the hard inode limit (expect EDQUOT)" | tee -a $seq.full + echo "*** push past the hard inode limit (expect EDQUOT)" | tee -a $seqres.full for i in 1 2 3 4 5 6 7 8 9 10 11 12 do _file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0 @@ -170,10 +173,10 @@ _exercise() echo # Note: for quota accounting (not enforcement), EDQUOT is not expected - echo "*** push past the hard block limit (expect EDQUOT)" | tee -a $seq.full + echo "*** push past the hard block limit (expect EDQUOT)" | tee -a $seqres.full _file_as_id $SCRATCH_MNT/softie $id $type 1024 540 - echo "ls -l $SCRATCH_MNT" >>$seq.full - ls -l $SCRATCH_MNT >>$seq.full + echo "ls -l $SCRATCH_MNT" >>$seqres.full + ls -l $SCRATCH_MNT >>$seqres.full _qmount xfs_quota -D $tmp.projects -P $tmp.projid -x \ -c "repquota -birnN -$type" $SCRATCH_DEV | diff --git a/tests/xfs/052 b/tests/xfs/052 index 01d54695..7655d856 100755 --- a/tests/xfs/052 +++ b/tests/xfs/052 @@ -26,6 +26,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -49,7 +52,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fs xfs _supported_os IRIX Linux -rm -f $seq.full +rm -f $seqres.full _require_scratch _require_xfs_quota @@ -59,8 +62,8 @@ _require_nobody _qmount_option uquota _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs -cat $tmp.mkfs >>$seq.full -chmod a+w $seq.full # arbitrary users will write here +cat $tmp.mkfs >>$seqres.full +chmod a+w $seqres.full # arbitrary users will write here # keep the blocksize from mkfs ($dbsize) . $tmp.mkfs @@ -94,7 +97,7 @@ xfs_quota -x \ # cross check blks, softblks, hardblks <-> quota, xfs_db xfs_quota -c "quota -$type -birnN $id" $SCRATCH_DEV | - tr -d '\n' | tr -s '[:space:]' | tee -a $seq.full | + tr -d '\n' | tr -s '[:space:]' | tee -a $seqres.full | perl -ne 'if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)]) { print "used_blocks=", $1, "\n"; print "soft_blocks=", $2, "\n"; @@ -102,14 +105,14 @@ xfs_quota -c "quota -$type -birnN $id" $SCRATCH_DEV | $next = 0; }' | LC_COLLATE=POSIX sort >$tmp.quota -echo ===quota output >> $seq.full -cat $tmp.quota >> $seq.full +echo ===quota output >> $seqres.full +cat $tmp.quota >> $seqres.full [ ! -s $tmp.quota ] && echo "warning: quota output file is empty" umount $SCRATCH_MNT # note - does (insitu) conversion from fs blocks to 1K blocks -xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seq.full | perl -ne ' +xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seqres.full | perl -ne ' if (/^diskdq.bcount = (\d+)$/) { print "used_blocks=", $1 * '$dbsize' / 1024, "\n"; } @@ -120,8 +123,8 @@ xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seq.full | perl -ne ' print "soft_blocks=", $1 * '$dbsize' / 1024, "\n"; }' | LC_COLLATE=POSIX sort >$tmp.xfs_db -echo ===xfs_db output >> $seq.full -cat $tmp.xfs_db >> $seq.full +echo ===xfs_db output >> $seqres.full +cat $tmp.xfs_db >> $seqres.full [ ! -s $tmp.xfs_db ] && echo "warning: xfs_db output file is empty" echo Comparing out of xfs_quota and xfs_db diff --git a/tests/xfs/054 b/tests/xfs/054 index 1ce6180c..b92d6fe8 100755 --- a/tests/xfs/054 +++ b/tests/xfs/054 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -46,8 +49,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fs xfs _supported_os Linux IRIX -cp /dev/null $seq.full -chmod ugo+rwx $seq.full +cp /dev/null $seqres.full +chmod ugo+rwx $seqres.full _require_scratch _require_xfs_quota @@ -98,7 +101,7 @@ _exercise() umount $SCRATCH_MNT 2>/dev/null } -_scratch_mkfs_xfs >> $seq.full 2>&1 || _fail "mkfs failed!" +_scratch_mkfs_xfs >> $seqres.full 2>&1 || _fail "mkfs failed!" _qmount_option "uquota,gquota" _qmount diff --git a/tests/xfs/055 b/tests/xfs/055 index 965b43a2..8c648c80 100755 --- a/tests/xfs/055 +++ b/tests/xfs/055 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/056 b/tests/xfs/056 index be65bfbf..dfab6534 100755 --- a/tests/xfs/056 +++ b/tests/xfs/056 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/057 b/tests/xfs/057 index faa47761..bc535792 100755 --- a/tests/xfs/057 +++ b/tests/xfs/057 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/058 b/tests/xfs/058 index dfce43b5..8d4a1aa0 100755 --- a/tests/xfs/058 +++ b/tests/xfs/058 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/059 b/tests/xfs/059 index a2a07c99..36ba942f 100755 --- a/tests/xfs/059 +++ b/tests/xfs/059 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/060 b/tests/xfs/060 index f0d9870b..9bcc9aae 100755 --- a/tests/xfs/060 +++ b/tests/xfs/060 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/061 b/tests/xfs/061 index fa980851..88cd8ff6 100755 --- a/tests/xfs/061 +++ b/tests/xfs/061 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/063 b/tests/xfs/063 index cdaf5247..46e4baca 100755 --- a/tests/xfs/063 +++ b/tests/xfs/063 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/064 b/tests/xfs/064 index c7e727c2..4f2143d4 100755 --- a/tests/xfs/064 +++ b/tests/xfs/064 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -66,14 +69,14 @@ while [ $i -le 9 ]; do _stable_fs sleep 2 - echo "********* level $i ***********" >>$seq.full - date >>$seq.full + echo "********* level $i ***********" >>$seqres.full + date >>$seqres.full find $SCRATCH_MNT -exec $here/src/lstat64 {} \; | sed 's/(00.*)//' >$tmp.dates.$i if [ $i -gt 0 ]; then let level_1=$i-1 - diff -c $tmp.dates.$level_1 $tmp.dates.$i >>$seq.full + diff -c $tmp.dates.$level_1 $tmp.dates.$i >>$seqres.full else - cat $tmp.dates.$i >>$seq.full + cat $tmp.dates.$i >>$seqres.full fi _do_dump_file -f $tmp.df.level$i -l $i diff --git a/tests/xfs/065 b/tests/xfs/065 index 12f2ac91..d3efdac4 100755 --- a/tests/xfs/065 +++ b/tests/xfs/065 @@ -26,6 +26,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/066 b/tests/xfs/066 index 7a68f792..130b6858 100755 --- a/tests/xfs/066 +++ b/tests/xfs/066 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/067 b/tests/xfs/067 index baaed777..dd20b8ac 100755 --- a/tests/xfs/067 +++ b/tests/xfs/067 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -46,14 +49,14 @@ _require_scratch # set up fs for 1K inodes isize=0 -_scratch_mkfs_xfs | _filter_mkfs >$seq.full 2>$tmp.mkfs +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs [ $? -eq 0 ] && source $tmp.mkfs if [ "$isize" -lt 1024 ]; then - _scratch_mkfs_xfs -i size=1024 >>$here/$seq.full \ + _scratch_mkfs_xfs -i size=1024 >>$here/$seqres.full \ || _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified" fi -_scratch_mount >>$here/$seq.full || _fail "mount failed" -xfs_info $SCRATCH_MNT >>$here/$seq.full +_scratch_mount >>$here/$seqres.full || _fail "mount failed" +xfs_info $SCRATCH_MNT >>$here/$seqres.full cd $SCRATCH_MNT echo "" diff --git a/tests/xfs/071 b/tests/xfs/071 index c135d1ab..c4c37bc5 100755 --- a/tests/xfs/071 +++ b/tests/xfs/071 @@ -22,8 +22,11 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" -rm -f $seq.full +rm -f $seqres.full here=`pwd` tmp=/tmp/$$ @@ -81,19 +84,19 @@ write_block() [ `$direct` ] && flags=-d echo "Writing $bytes bytes, offset is $words (direct=$direct)" | _filter_io - echo "Writing $bytes bytes at $location $words (direct=$direct)" >>$seq.full + echo "Writing $bytes bytes at $location $words (direct=$direct)" >>$seqres.full $XFS_IO_PROG -c "pwrite $offset 512" $flags $SCRATCH_MNT/$seq \ - 2>&1 | _filter_off $offset | tee -a $seq.full | _filter_pwrite - xfs_bmap -v $SCRATCH_MNT/$seq >>$seq.full + 2>&1 | _filter_off $offset | tee -a $seqres.full | _filter_pwrite + xfs_bmap -v $SCRATCH_MNT/$seq >>$seqres.full echo "Reading $bytes bytes (direct=$direct)" | _filter_io - echo "Reading $bytes bytes at $location (direct=$direct)" >>$seq.full + echo "Reading $bytes bytes at $location (direct=$direct)" >>$seqres.full $XFS_IO_PROG -c "pread $offset $bytes" $flags $SCRATCH_MNT/$seq \ - 2>&1 | _filter_off $offset | tee -a $seq.full | _filter_pread + 2>&1 | _filter_off $offset | tee -a $seqres.full | _filter_pread - $XFS_IO_PROG -c "pread -v $offset $bytes" $flags $SCRATCH_MNT/$seq >>$seq.full 2>&1 + $XFS_IO_PROG -c "pread -v $offset $bytes" $flags $SCRATCH_MNT/$seq >>$seqres.full 2>&1 - echo | tee -a $seq.full + echo | tee -a $seqres.full } # real QA test starts here diff --git a/tests/xfs/072 b/tests/xfs/072 index 930a983f..5c796a9c 100755 --- a/tests/xfs/072 +++ b/tests/xfs/072 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" _cleanup() @@ -49,7 +52,7 @@ _supported_os IRIX Linux _require_scratch -rm -f $seq.full +rm -f $seqres.full umount $SCRATCH_DEV >/dev/null 2>&1 _scratch_mkfs_xfs >/dev/null || _fail "mkfs failed" diff --git a/tests/xfs/073 b/tests/xfs/073 index 3a5129fb..bdc4dc22 100755 --- a/tests/xfs/073 +++ b/tests/xfs/073 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/078 b/tests/xfs/078 index 901723ea..a897e60c 100755 --- a/tests/xfs/078 +++ b/tests/xfs/078 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/080 b/tests/xfs/080 index 3243fe1e..952d31e7 100755 --- a/tests/xfs/080 +++ b/tests/xfs/080 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/081 b/tests/xfs/081 index f0ee819e..316172c8 100755 --- a/tests/xfs/081 +++ b/tests/xfs/081 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -50,7 +53,7 @@ _cleanup() trap "_cleanup; exit \$status" 0 1 2 3 15 # prelim -rm -f $seq.full $tmp.* +rm -f $seqres.full $tmp.* _require_scratch _require_xfs_quota _require_v2log diff --git a/tests/xfs/082 b/tests/xfs/082 index e21a7938..d38fb0ce 100755 --- a/tests/xfs/082 +++ b/tests/xfs/082 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -48,7 +51,7 @@ _supported_fs xfs _supported_os IRIX Linux # prelim -rm -f $seq.full $tmp.* +rm -f $seqres.full $tmp.* _require_scratch _require_v2log diff --git a/tests/xfs/084 b/tests/xfs/084 index ba5743aa..d4482f83 100755 --- a/tests/xfs/084 +++ b/tests/xfs/084 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/085 b/tests/xfs/085 index 44123ad8..c72d94ea 100755 --- a/tests/xfs/085 +++ b/tests/xfs/085 @@ -26,6 +26,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -42,24 +45,24 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 _supported_fs xfs _supported_os IRIX Linux -rm -f $seq.full +rm -f $seqres.full rm -f $tmp.log _require_scratch echo "mkfs" -_scratch_mkfs_xfs >>$seq.full 2>&1 \ +_scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs scratch failed" echo "mount" -_scratch_mount >>$seq.full 2>&1 \ +_scratch_mount >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" echo "touch files" touch $SCRATCH_MNT/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9} echo "godown" -src/godown -v -f $SCRATCH_MNT >> $seq.full +src/godown -v -f $SCRATCH_MNT >> $seqres.full echo "unmount" umount $SCRATCH_MNT @@ -75,7 +78,7 @@ if false; then fi echo "mount with replay" -_scratch_mount $mnt >>$seq.full 2>&1 \ +_scratch_mount $mnt >>$seqres.full 2>&1 \ || _fail "mount failed: $mnt $MOUNT_OPTIONS" echo "ls SCRATCH_MNT" diff --git a/tests/xfs/086 b/tests/xfs/086 index b59ad0a8..b58780a3 100755 --- a/tests/xfs/086 +++ b/tests/xfs/086 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -41,7 +44,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 _supported_fs xfs _supported_os IRIX Linux -rm -f $seq.full $tmp.* +rm -f $seqres.full $tmp.* _require_scratch _require_v2log @@ -83,7 +86,7 @@ for s in sync nosync ; do # mkfs the FS _echofull "mkfs" - _scratch_mkfs_xfs >>$seq.full 2>&1 + _scratch_mkfs_xfs >>$seqres.full 2>&1 if [ $? -ne 0 ] ; then _echofull "mkfs failed: $MKFS_OPTIONS" continue @@ -91,7 +94,7 @@ for s in sync nosync ; do # mount the FS _echofull "mount" - if ! _scratch_mount >>$seq.full 2>&1; then + if ! _scratch_mount >>$seqres.full 2>&1; then _echofull "mount failed: $MOUNT_OPTIONS" continue fi @@ -116,17 +119,17 @@ for s in sync nosync ; do ls $SCRATCH_MNT _echofull "godown" - src/godown -v -f $SCRATCH_MNT >> $seq.full + src/godown -v -f $SCRATCH_MNT >> $seqres.full _echofull "unmount" - umount $SCRATCH_DEV >>$seq.full 2>&1 \ + umount $SCRATCH_DEV >>$seqres.full 2>&1 \ || _fail "umount failed" _echofull "logprint after going down..." _print_logstate _echofull "mount with replay" - _scratch_mount >>$seq.full 2>&1 \ + _scratch_mount >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # check on what FS looks like after log recovery diff --git a/tests/xfs/087 b/tests/xfs/087 index 3cb69904..43c23f05 100755 --- a/tests/xfs/087 +++ b/tests/xfs/087 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -46,7 +49,7 @@ _do_meta() -f rename=30 -f stat=30 -f unlink=30 -f truncate=20" _echofull "calling fsstress $param -m8 -n $count" FSSTRESS_ARGS=`_scale_fsstress_args $param $FSSTRESS_AVOID -m 8 -n $count -d $out` - if ! $FSSTRESS_PROG $FSSTRESS_ARGS >>$seq.full 2>&1 + if ! $FSSTRESS_PROG $FSSTRESS_ARGS >>$seqres.full 2>&1 then _echofull "fsstress failed" fi @@ -56,7 +59,7 @@ _do_meta() _supported_fs xfs _supported_os IRIX Linux -rm -f $seq.full $tmp.* +rm -f $seqres.full $tmp.* _require_scratch _require_v2log _require_xfs_quota @@ -91,7 +94,7 @@ do # mkfs the FS _echofull "mkfs" - _scratch_mkfs_xfs >>$seq.full 2>&1 + _scratch_mkfs_xfs >>$seqres.full 2>&1 if [ $? -ne 0 ] ; then _echofull "mkfs failed: $MKFS_OPTIONS" continue @@ -99,7 +102,7 @@ do # mount the FS _echofull "mount" - if ! _scratch_mount -o uquota >>$seq.full 2>&1; then + if ! _scratch_mount -o uquota >>$seqres.full 2>&1; then _echofull "mount failed: $MOUNT_OPTIONS" continue fi @@ -112,20 +115,20 @@ do ls -RF $SCRATCH_MNT >$tmp.ls1 _echofull "godown" - src/godown -v -f $SCRATCH_MNT >> $seq.full + src/godown -v -f $SCRATCH_MNT >> $seqres.full _echofull "unmount" - umount $SCRATCH_DEV >>$seq.full 2>&1 \ + umount $SCRATCH_DEV >>$seqres.full 2>&1 \ || _fail "umount failed" _echofull "logprint after going down..." _print_logstate _full "logprint headers" - _scratch_xfs_logprint -n >>$seq.full 2>&1 + _scratch_xfs_logprint -n >>$seqres.full 2>&1 _echofull "mount with replay" - _scratch_mount -o uquota >>$seq.full 2>&1 \ + _scratch_mount -o uquota >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # check on what FS looks like after log recovery diff --git a/tests/xfs/090 b/tests/xfs/090 index 8ce50c00..4b006d42 100755 --- a/tests/xfs/090 +++ b/tests/xfs/090 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/092 b/tests/xfs/092 index 2f849f33..76aa5c16 100755 --- a/tests/xfs/092 +++ b/tests/xfs/092 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/094 b/tests/xfs/094 index 4f4cf34a..04b096c2 100755 --- a/tests/xfs/094 +++ b/tests/xfs/094 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/095 b/tests/xfs/095 index 9de44764..f31a88a3 100755 --- a/tests/xfs/095 +++ b/tests/xfs/095 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/096 b/tests/xfs/096 index d06bd59b..9bb6b910 100755 --- a/tests/xfs/096 +++ b/tests/xfs/096 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -63,7 +66,7 @@ _cleanup() # _mkfs_filter() { - tee -a $seq.full | \ + tee -a $seqres.full | \ sed \ -e 's/extsz=[0-9][0-9]*[ ]*/extsz=N, /' \ -e 's/blocks=[0-9][0-9]*/blocks=N/' \ @@ -89,7 +92,7 @@ _mkfs_filter() } # real QA test starts here -rm -f $seq.full +rm -f $seqres.full # Modify as appropriate. _supported_fs xfs diff --git a/tests/xfs/103 b/tests/xfs/103 index 02c3f9d1..0753f8ae 100755 --- a/tests/xfs/103 +++ b/tests/xfs/103 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/104 b/tests/xfs/104 index 59db7607..3af52c77 100755 --- a/tests/xfs/104 +++ b/tests/xfs/104 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -37,7 +40,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 _create_scratch() { echo "*** mkfs" - _scratch_mkfs_xfs $@ | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs + _scratch_mkfs_xfs $@ | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs . $tmp.mkfs echo "*** mount" @@ -64,13 +67,13 @@ _stress_scratch() # -w ensures that the only ops are ones which cause write I/O FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ -n $nops $FSSTRESS_AVOID` - $FSSTRESS_PROG $FSSTRESS_ARGS >> $seq.full & + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full & } # real QA test starts here _supported_fs xfs _require_scratch -_scratch_mkfs_xfs | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs . $tmp.mkfs # extract blocksize and data size for scratch device endsize=`expr 550 \* 1048576` # stop after growing this big @@ -95,19 +98,19 @@ _fill_scratch $fillsize # while [ $size -le $endsize ]; do echo "*** stressing a ${size} byte filesystem" - echo "*** stressing a ${sizeb} block filesystem" >> $seq.full + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full _stress_scratch sleep 1 size=`expr $size + $incsize` sizeb=`expr $size / $dbsize` # in data blocks echo "*** growing to a ${size} byte filesystem" - echo "*** growing to a ${sizeb} block filesystem" >> $seq.full + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full xfs_growfs -D ${sizeb} $SCRATCH_MNT \ - | tee -a $seq.full | _filter_mkfs 2>$tmp.growfs + | tee -a $seqres.full | _filter_mkfs 2>$tmp.growfs . $tmp.growfs [ `expr $size % $modsize` -eq 0 ] && wait # every 4th iteration - echo AGCOUNT=$agcount | tee -a $seq.full - echo && echo >> $seq.full + echo AGCOUNT=$agcount | tee -a $seqres.full + echo && echo >> $seqres.full done wait # stop for any remaining stress processes diff --git a/tests/xfs/106 b/tests/xfs/106 index e8f1d454..58d753b1 100755 --- a/tests/xfs/106 +++ b/tests/xfs/106 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -44,7 +47,7 @@ _require_xfs_quota # real QA test starts here _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs -cat $tmp.mkfs >$seq.full +cat $tmp.mkfs >$seqres.full . $tmp.mkfs # setup a default run @@ -115,7 +118,7 @@ s/Inode: \#\d+ \(\d+ blocks, \d+ extents\)/Inode: #[INO] (X blocks, Y extents)/; test_quot() { echo "checking quot command (type=$type)" # not deterministic on blks - xfs_quota -x -c "quot -n -$type" $SCRATCH_MNT >>$seq.full 2>&1 + xfs_quota -x -c "quot -n -$type" $SCRATCH_MNT >>$seqres.full 2>&1 } test_report() diff --git a/tests/xfs/107 b/tests/xfs/107 index 2c98b571..7abee5ee 100755 --- a/tests/xfs/107 +++ b/tests/xfs/107 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -56,7 +59,7 @@ _require_xfs_quota # real QA test starts here _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs -cat $tmp.mkfs >$seq.full +cat $tmp.mkfs >$seqres.full . $tmp.mkfs # setup a default run @@ -72,7 +75,7 @@ _require_prjquota $SCRATCH_DEV echo "### create projects file" rm -f $tmp.projects target=$SCRATCH_MNT/project -echo "6:$target" | tee -a $seq.full > $tmp.projects +echo "6:$target" | tee -a $seqres.full > $tmp.projects echo "### populate filesystem" mkdir $target || exit diff --git a/tests/xfs/108 b/tests/xfs/108 index 6b656e68..9f231508 100755 --- a/tests/xfs/108 +++ b/tests/xfs/108 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -57,15 +60,15 @@ test_files() test_accounting() { echo "### some controlled buffered, direct and mmapd IO (type=$type)" - echo "--- initiating parallel IO..." >>$seq.full + echo "--- initiating parallel IO..." >>$seqres.full $XFS_IO_PROG -c 'pwrite -b 1m 0 16m' -c 'fsync' \ - $SCRATCH_MNT/buffer >>$seq.full 2>&1 & + $SCRATCH_MNT/buffer >>$seqres.full 2>&1 & $XFS_IO_PROG -c 'pwrite -b 1m 0 16m' -d \ - $SCRATCH_MNT/direct >>$seq.full 2>&1 & + $SCRATCH_MNT/direct >>$seqres.full 2>&1 & $XFS_IO_PROG -c 't 16m' -c 'mm -rw 0 16m' -c 'mw 0 16m' -c 'ms -s' \ - $SCRATCH_MNT/mmap >>$seq.full 2>&1 & + $SCRATCH_MNT/mmap >>$seqres.full 2>&1 & wait - echo "--- completed parallel IO ($type)" >>$seq.full + echo "--- completed parallel IO ($type)" >>$seqres.full for file in $SCRATCH_MNT/{buffer,direct,mmap}; do $here/src/lstat64 $file | head -3 | _filter_scratch @@ -80,10 +83,10 @@ _qmount _require_prjquota $SCRATCH_DEV # real QA test starts here -rm -f $tmp.projects $seq.full +rm -f $tmp.projects $seqres.full umount $SCRATCH_DEV 2>/dev/null _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs -cat $tmp.mkfs >>$seq.full +cat $tmp.mkfs >>$seqres.full _scratch_mount uid=1 diff --git a/tests/xfs/109 b/tests/xfs/109 index 56364f43..0a115b7b 100755 --- a/tests/xfs/109 +++ b/tests/xfs/109 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -102,7 +105,7 @@ fi umount $SCRATCH_DEV _scratch_mkfs_xfs -dsize=160m,agcount=4 $faststart | _filter_mkfs 2>$tmp.mkfs -cat $tmp.mkfs >>$seq.full +cat $tmp.mkfs >>$seqres.full _scratch_mount populate diff --git a/tests/xfs/110 b/tests/xfs/110 index 8749afa4..52c782c6 100755 --- a/tests/xfs/110 +++ b/tests/xfs/110 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/111 b/tests/xfs/111 index 8f4c142d..94fd93fe 100755 --- a/tests/xfs/111 +++ b/tests/xfs/111 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/114 b/tests/xfs/114 index a4ba98de..61dd7819 100755 --- a/tests/xfs/114 +++ b/tests/xfs/114 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -79,8 +82,8 @@ _test_create() p=dir2/dir3/dir4/file4 touch $p - #_print_names $p >>$here/$seq.full - _print_names $p | tee -a $here/$seq.full + #_print_names $p >>$here/$seqres.full + _print_names $p | tee -a $here/$seqres.full _check_paths $SCRATCH_MNT/$p } @@ -130,13 +133,13 @@ _test_hardlink() ln $p $x done - _print_names $p >>$here/$seq.full + _print_names $p >>$here/$seqres.full echo "" echo "print out names and check after created hardlinks" echo "" for x in $paths; do - _print_names $x | tee -a $here/$seq.full + _print_names $x | tee -a $here/$seqres.full _check_paths $SCRATCH_MNT/$x done @@ -160,7 +163,7 @@ _test_hardlink() echo "" for x in $paths; do if [ -e $x ]; then - _print_names $x | tee -a $here/$seq.full + _print_names $x | tee -a $here/$seqres.full _check_paths $SCRATCH_MNT/$x fi done @@ -229,7 +232,7 @@ _test_rename() _filter_num() { - tee -a $here/$seq.full |\ + tee -a $here/$seqres.full |\ sed -e 's/[0-9][0-9]* inodes/I inodes/g' \ -e 's/[0-9][0-9]* paths/P paths/g' \ -e 's/seed = [0-9][0-9]*/seed = S/' @@ -254,7 +257,7 @@ _test_fsstress() if ! $FSSTRESS_PROG $args | _filter_num then echo " fsstress $args returned $?" - cat $tmp.out | tee -a $here/$seq.full + cat $tmp.out | tee -a $here/$seqres.full status=1 fi @@ -283,8 +286,8 @@ _test_dirstress() if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num then echo " dirstress failed" - echo "*** dirstress $args" | tee -a $here/$seq.full - cat $tmp.out >>$here/$seq.full + echo "*** dirstress $args" | tee -a $here/$seqres.full + cat $tmp.out >>$here/$seqres.full status=1 exit fi @@ -294,8 +297,8 @@ _test_dirstress() if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num then echo " dirstress failed" - echo "*** dirstress $args" | tee -a $here/$seq.full - cat $tmp.out >>$here/$seq.full + echo "*** dirstress $args" | tee -a $here/$seqres.full + cat $tmp.out >>$here/$seqres.full status=1 exit fi @@ -315,16 +318,16 @@ _require_scratch _require_attrs _need_to_be_root -rm -f $here/$seq.full +rm -f $here/$seqres.full echo "mkfs" -_scratch_mkfs_xfs >>$here/$seq.full 2>&1 \ +_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \ || _fail "mkfs scratch failed" -_scratch_mkfs_xfs -i parent=1 >>$here/$seq.full 2>&1 \ +_scratch_mkfs_xfs -i parent=1 >>$here/$seqres.full 2>&1 \ || _notrun "parent inodes not supported" echo "mount" -_scratch_mount >>$here/$seq.full 2>&1 \ +_scratch_mount >>$here/$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # real QA test starts here diff --git a/tests/xfs/115 b/tests/xfs/115 index ebcc9951..bb98ee5a 100755 --- a/tests/xfs/115 +++ b/tests/xfs/115 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -101,16 +104,16 @@ _supported_os IRIX _require_scratch _require_attrs -rm -f $here/$seq.full +rm -f $here/$seqres.full echo "mkfs" -_scratch_mkfs_xfs >>$here/$seq.full 2>&1 \ +_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \ || _fail "mkfs scratch failed" -_scratch_mkfs_xfs -i paths=1 >>$here/$seq.full 2>&1 \ +_scratch_mkfs_xfs -i paths=1 >>$here/$seqres.full 2>&1 \ || _notrun "i_paths not supported" echo "mount" -_scratch_mount >>$here/$seq.full 2>&1 \ +_scratch_mount >>$here/$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # real QA test starts here @@ -251,7 +254,7 @@ _do_test() xfs_repair_ipaths -n $SCRATCH_MNT } -_do_test 2>&1 | tee $seq.full | _filter_inodes +_do_test 2>&1 | tee $seqres.full | _filter_inodes # success, all done status=0 diff --git a/tests/xfs/116 b/tests/xfs/116 index 2c3ab927..a996117f 100755 --- a/tests/xfs/116 +++ b/tests/xfs/116 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/118 b/tests/xfs/118 index d140a8be..4145ea26 100755 --- a/tests/xfs/118 +++ b/tests/xfs/118 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -72,7 +75,7 @@ _chowning_file() echo "mkfs on scratch" -_scratch_mkfs_xfs >$seq.full +_scratch_mkfs_xfs >$seqres.full echo "mount with quotas" export MOUNT_OPTIONS="-o uquota" diff --git a/tests/xfs/119 b/tests/xfs/119 index 85af2111..e3b20736 100755 --- a/tests/xfs/119 +++ b/tests/xfs/119 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/121 b/tests/xfs/121 index a590bb04..d2dc9359 100755 --- a/tests/xfs/121 +++ b/tests/xfs/121 @@ -27,6 +27,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -43,17 +46,17 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 _supported_fs xfs _supported_os IRIX Linux -rm -f $seq.full +rm -f $seqres.full rm -f $tmp.log _require_scratch echo "mkfs" -_scratch_mkfs_xfs >>$seq.full 2>&1 \ +_scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs scratch failed" echo "mount" -_scratch_mount >>$seq.full 2>&1 \ +_scratch_mount >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS) @@ -68,7 +71,7 @@ src/multi_open_unlink -f $SCRATCH_MNT/test_file -n $num_files -s $delay & sleep 3 echo "godown" -src/godown -v -f $SCRATCH_MNT >> $seq.full +src/godown -v -f $SCRATCH_MNT >> $seqres.full # time for multi_open_unlink to exit out after its delay # so we have no references and can unmount @@ -81,11 +84,11 @@ echo "logprint after going down..." _print_logstate echo "mount with replay" -_scratch_mount $mnt >>$seq.full 2>&1 \ +_scratch_mount $mnt >>$seqres.full 2>&1 \ || _fail "mount failed: $mnt $MOUNT_OPTIONS" echo "godown" -src/godown -v -f $SCRATCH_MNT >> $seq.full +src/godown -v -f $SCRATCH_MNT >> $seqres.full echo "unmount" umount $SCRATCH_MNT @@ -94,7 +97,7 @@ echo "logprint after going down..." _print_logstate echo "logprint to check for CLEAR_AGI_BUCKET..." -if _scratch_xfs_logprint -t | tee -a $seq.full | grep CLEAR; then +if _scratch_xfs_logprint -t | tee -a $seqres.full | grep CLEAR; then echo 'CLEAR_AGI_BUCKET transactions found!!' echo 'Are you running with an old xfs kernel - where the bug still exists?' else @@ -102,7 +105,7 @@ else fi # clean up dirty log with log recovery on mount -_scratch_mount >> $seq.full 2>&1 \ +_scratch_mount >> $seqres.full 2>&1 \ || _fail "mount failed" # should now be peaches diff --git a/tests/xfs/122 b/tests/xfs/122 index 1c4f3a4e..d3a97071 100755 --- a/tests/xfs/122 +++ b/tests/xfs/122 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -176,7 +179,7 @@ echo 'int main(int argc, char *argv[]) {' >>$cprog # cat /usr/include/xfs/xfs*.h | indent |\ _attribute_filter |\ -tee $seq.full |\ +tee $seqres.full |\ egrep '} *xfs_.*_t' |\ egrep -v -f $tmp.ignore |\ awk '{sub(/[;,]/,"",$2); print "printf(\"sizeof(", $2, ") = %d\\n\", sizeof(", $2, "));"}' \ @@ -198,8 +201,8 @@ awk ' echo 'return 0; }' >>$cprog # create and run program -cc -o $oprog $cprog >> $seq.full 2>&1 || \ - _notrun "Could not compile test program (see end of $seq.full)" +cc -o $oprog $cprog >> $seqres.full 2>&1 || \ + _notrun "Could not compile test program (see end of $seqres.full)" $oprog | _type_size_filter | _type_name_filter > $progout # diff --git a/tests/xfs/134 b/tests/xfs/134 index 2117b4a1..0fffbe55 100755 --- a/tests/xfs/134 +++ b/tests/xfs/134 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -60,8 +63,8 @@ cat >$tmp.projid <<EOF test:1 EOF -cp /dev/null $seq.full -chmod a+rwx $seq.full # arbitrary users will write here +cp /dev/null $seqres.full +chmod a+rwx $seqres.full # arbitrary users will write here _require_scratch _scratch_mkfs_xfs >/dev/null 2>&1 diff --git a/tests/xfs/136 b/tests/xfs/136 index 6479c8c5..97378c43 100755 --- a/tests/xfs/136 +++ b/tests/xfs/136 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/137 b/tests/xfs/137 index 0f65d082..8bcc1f86 100755 --- a/tests/xfs/137 +++ b/tests/xfs/137 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/138 b/tests/xfs/138 index f8af8dd6..d476fa79 100755 --- a/tests/xfs/138 +++ b/tests/xfs/138 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/139 b/tests/xfs/139 index 7d2e4098..bb5ea2c3 100755 --- a/tests/xfs/139 +++ b/tests/xfs/139 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/140 b/tests/xfs/140 index a8cbd09b..2031ed9b 100755 --- a/tests/xfs/140 +++ b/tests/xfs/140 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/142 b/tests/xfs/142 index 526167d3..30908365 100755 --- a/tests/xfs/142 +++ b/tests/xfs/142 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/143 b/tests/xfs/143 index 63281f91..c921e381 100755 --- a/tests/xfs/143 +++ b/tests/xfs/143 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/144 b/tests/xfs/144 index 52123cce..f2510212 100755 --- a/tests/xfs/144 +++ b/tests/xfs/144 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/145 b/tests/xfs/145 index 54b81986..093ff332 100755 --- a/tests/xfs/145 +++ b/tests/xfs/145 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/146 b/tests/xfs/146 index bb4975c0..14060188 100755 --- a/tests/xfs/146 +++ b/tests/xfs/146 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/147 b/tests/xfs/147 index e366dc7d..0cc4047a 100755 --- a/tests/xfs/147 +++ b/tests/xfs/147 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/148 b/tests/xfs/148 index abc516a4..20ba12ec 100755 --- a/tests/xfs/148 +++ b/tests/xfs/148 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/149 b/tests/xfs/149 index b1793b78..47b5a58e 100755 --- a/tests/xfs/149 +++ b/tests/xfs/149 @@ -24,13 +24,16 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 -rm -f $seq.full +rm -f $seqres.full # get standard environment, filters and checks . ./common.rc @@ -44,15 +47,15 @@ export XFS_REPAIR_PROG=$XFS_PARALLEL_REPAIR_PROG _check_repair() { - echo "Repairing, round 0" >> $seq.full - _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seq.full >$tmp.0 + echo "Repairing, round 0" >> $seqres.full + _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seqres.full >$tmp.0 for i in 1 2 3 4 do - echo "Repairing, iteration $i" | tee -a $seq.full + echo "Repairing, iteration $i" | tee -a $seqres.full _scratch_xfs_repair 2>&1 | _filter_repair >$tmp.$i - diff $tmp.0 $tmp.$i >> $seq.full + diff $tmp.0 $tmp.$i >> $seqres.full if [ $? -ne 0 ]; then - echo "ERROR: repair round $i differs to round 0 (see $seq.full)" | tee -a $seq.full + echo "ERROR: repair round $i differs to round 0 (see $seqres.full)" | tee -a $seqres.full break fi # echo all interesting stuff... diff --git a/tests/xfs/150 b/tests/xfs/150 index b6a04c56..ae33d1c3 100755 --- a/tests/xfs/150 +++ b/tests/xfs/150 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/151 b/tests/xfs/151 index 4bfaff36..d1b65e7b 100755 --- a/tests/xfs/151 +++ b/tests/xfs/151 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -55,7 +58,7 @@ _check_sids() | perl -ne "if (/^sids.*[\"|\s]($i)[\"|\s].*/) {print \$1} ;"` if [ -z "$CHECKED_SID" ] ; then echo "ERROR: SID(s) not created" - ${DMAPI_QASUITE1_DIR}../simple/dm_getall_sessions >>$seq.full + ${DMAPI_QASUITE1_DIR}../simple/dm_getall_sessions >>$seqres.full return fi done diff --git a/tests/xfs/152 b/tests/xfs/152 index 2317291e..35981acd 100755 --- a/tests/xfs/152 +++ b/tests/xfs/152 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/153 b/tests/xfs/153 index 81be175f..75ae57bb 100755 --- a/tests/xfs/153 +++ b/tests/xfs/153 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/154 b/tests/xfs/154 index 62e79c21..3b032a81 100755 --- a/tests/xfs/154 +++ b/tests/xfs/154 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/155 b/tests/xfs/155 index 949bd982..e379ebde 100755 --- a/tests/xfs/155 +++ b/tests/xfs/155 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/156 b/tests/xfs/156 index 549cac8d..f37809cf 100755 --- a/tests/xfs/156 +++ b/tests/xfs/156 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -48,8 +51,8 @@ _require_scratch _scratch_mkfs_xfs >/dev/null 2>&1 _dmapi_scratch_mount -${DMAPI_QASUITE1_DIR}cmd/get_dirattrs $SCRATCH_MNT > $seq.full -[ $? -ne 0 ] && echo "get_dirattrs failed - see $seq.full" +${DMAPI_QASUITE1_DIR}cmd/get_dirattrs $SCRATCH_MNT > $seqres.full +[ $? -ne 0 ] && echo "get_dirattrs failed - see $seqres.full" status=0 exit diff --git a/tests/xfs/157 b/tests/xfs/157 index 9ae3c40f..1bd70526 100755 --- a/tests/xfs/157 +++ b/tests/xfs/157 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/158 b/tests/xfs/158 index e740654a..13712003 100755 --- a/tests/xfs/158 +++ b/tests/xfs/158 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/159 b/tests/xfs/159 index bfc225d9..cb954c87 100755 --- a/tests/xfs/159 +++ b/tests/xfs/159 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/160 b/tests/xfs/160 index 3900299e..4c3c53da 100755 --- a/tests/xfs/160 +++ b/tests/xfs/160 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/161 b/tests/xfs/161 index c4193808..39249aca 100755 --- a/tests/xfs/161 +++ b/tests/xfs/161 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/162 b/tests/xfs/162 index acd70e02..57f027db 100755 --- a/tests/xfs/162 +++ b/tests/xfs/162 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/163 b/tests/xfs/163 index d4eef649..b1857fe4 100755 --- a/tests/xfs/163 +++ b/tests/xfs/163 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/164 b/tests/xfs/164 index 1ef4aafe..ed2cb550 100755 --- a/tests/xfs/164 +++ b/tests/xfs/164 @@ -29,6 +29,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -44,7 +47,7 @@ _cleanup() _filter_io() { - tee -a $seq.full | sed 's/ops;.*/ops/' + tee -a $seqres.full | sed 's/ops;.*/ops/' } # @@ -55,7 +58,7 @@ _filter_bmap() { awk '$3 ~ /hole/ { print $1, $2, $3; next } $7 ~ /10000/ { print $1, $2, "unwritten"; next } - {print $1, $2}' >> $seq.full + {print $1, $2}' >> $seqres.full } diff --git a/tests/xfs/165 b/tests/xfs/165 index 3b321b98..ec14cbfd 100755 --- a/tests/xfs/165 +++ b/tests/xfs/165 @@ -26,6 +26,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -41,7 +44,7 @@ _cleanup() _filter_io() { - tee -a $seq.full | _filter_xfs_io + tee -a $seqres.full | _filter_xfs_io } # @@ -52,7 +55,7 @@ _filter_io() _filter_bmap() { awk '$3 ~ /hole/ { print $1, $2, $3; next } - {print $1, $2}' >> $seq.full + {print $1, $2}' >> $seqres.full } # get standard environment, filters and checks @@ -68,7 +71,7 @@ _supported_os IRIX Linux # io tests testfile=$TEST_DIR/file.$seq rm -f $testfile -rm -f $seq.full +rm -f $seqres.full len=4 end=`expr 10 \* $len` diff --git a/tests/xfs/166 b/tests/xfs/166 index 527686ff..a1938375 100755 --- a/tests/xfs/166 +++ b/tests/xfs/166 @@ -23,13 +23,16 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 -rm -f $seq.full +rm -f $seqres.full _cleanup() { @@ -91,7 +94,7 @@ FILE_SIZE=1048576 rm -f $TEST_FILE $TEST_PROG $FILE_SIZE $TEST_FILE -xfs_bmap -vp $TEST_FILE >> $seq.full +xfs_bmap -vp $TEST_FILE >> $seqres.full xfs_bmap -vp $TEST_FILE | _filter_blocks status=0 diff --git a/tests/xfs/167 b/tests/xfs/167 index b2895fda..53100dfc 100755 --- a/tests/xfs/167 +++ b/tests/xfs/167 @@ -23,11 +23,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -44,7 +47,7 @@ workout() nops=15000 FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -p $procs -n $nops \ $FSSTRESS_AVOID` - $FSSTRESS_PROG $FSSTRESS_ARGS >> $seq.full & + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full & sleep 2 } diff --git a/tests/xfs/168 b/tests/xfs/168 index 8980f9bb..405b0264 100755 --- a/tests/xfs/168 +++ b/tests/xfs/168 @@ -24,11 +24,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -106,7 +109,7 @@ wait # dmapi destroy events are asyncronous, don't rely on fixed ordering of events # in print_event output, use sort. echo "# here comes the dmapi print_event filtered and sorted output" -cat $tmp.print_event_out | tee -a $here/$seq.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort +cat $tmp.print_event_out | tee -a $here/$seqres.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort rm $tmp.print_event_out status=0 diff --git a/tests/xfs/170 b/tests/xfs/170 index b725d3af..d1423a93 100755 --- a/tests/xfs/170 +++ b/tests/xfs/170 @@ -25,11 +25,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 diff --git a/tests/xfs/171 b/tests/xfs/171 index 4f77a417..c6ca99b2 100755 --- a/tests/xfs/171 +++ b/tests/xfs/171 @@ -24,11 +24,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 diff --git a/tests/xfs/172 b/tests/xfs/172 index b6b496c6..d7e84c7f 100755 --- a/tests/xfs/172 +++ b/tests/xfs/172 @@ -24,11 +24,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 diff --git a/tests/xfs/173 b/tests/xfs/173 index 7146d2ff..86cd83b7 100755 --- a/tests/xfs/173 +++ b/tests/xfs/173 @@ -24,11 +24,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 diff --git a/tests/xfs/174 b/tests/xfs/174 index 7745a6a1..f711d9c4 100755 --- a/tests/xfs/174 +++ b/tests/xfs/174 @@ -24,11 +24,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 diff --git a/tests/xfs/175 b/tests/xfs/175 index 4fc3ffbe..bfb126c9 100755 --- a/tests/xfs/175 +++ b/tests/xfs/175 @@ -26,11 +26,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 diff --git a/tests/xfs/176 b/tests/xfs/176 index 93083c4e..0b45677c 100755 --- a/tests/xfs/176 +++ b/tests/xfs/176 @@ -23,11 +23,14 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ -rm -f $seq.full +rm -f $seqres.full status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 diff --git a/tests/xfs/177 b/tests/xfs/177 index ec8aca72..44e82c76 100755 --- a/tests/xfs/177 +++ b/tests/xfs/177 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/178 b/tests/xfs/178 index 88566563..9d0e186f 100755 --- a/tests/xfs/178 +++ b/tests/xfs/178 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/179 b/tests/xfs/179 index f3faccab..3bb01a99 100755 --- a/tests/xfs/179 +++ b/tests/xfs/179 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/180 b/tests/xfs/180 index 0f823069..49266524 100755 --- a/tests/xfs/180 +++ b/tests/xfs/180 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/181 b/tests/xfs/181 index fb651004..36329caa 100755 --- a/tests/xfs/181 +++ b/tests/xfs/181 @@ -27,6 +27,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" _cleanup() @@ -50,17 +53,17 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fs xfs _supported_os IRIX Linux -rm -f $seq.full +rm -f $seqres.full rm -f $tmp.log _require_scratch echo "mkfs" -_scratch_mkfs_xfs >>$seq.full 2>&1 \ +_scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs scratch failed" echo "mount" -_scratch_mount >>$seq.full 2>&1 \ +_scratch_mount >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS) @@ -81,7 +84,7 @@ pid=$! sleep 10 echo "godown" -src/godown -v -f $SCRATCH_MNT >> $seq.full +src/godown -v -f $SCRATCH_MNT >> $seqres.full # kill the multi_open_unlink kill $pid 2>/dev/null @@ -95,11 +98,11 @@ echo "logprint after going down..." _print_logstate echo "mount with replay" -_scratch_mount $mnt >>$seq.full 2>&1 \ +_scratch_mount $mnt >>$seqres.full 2>&1 \ || _fail "mount failed: $mnt $MOUNT_OPTIONS" echo "godown" -src/godown -v -f $SCRATCH_MNT >> $seq.full +src/godown -v -f $SCRATCH_MNT >> $seqres.full echo "unmount" umount $SCRATCH_MNT @@ -108,7 +111,7 @@ echo "logprint after going down..." _print_logstate echo "logprint to check for CLEAR_AGI_BUCKET..." -if _scratch_xfs_logprint -t | tee -a $seq.full | grep CLEAR; then +if _scratch_xfs_logprint -t | tee -a $seqres.full | grep CLEAR; then echo 'CLEAR_AGI_BUCKET transactions found!!' echo 'Are you running with an old xfs kernel - where the bug still exists?' else @@ -116,7 +119,7 @@ else fi # clean up dirty log with log recovery on mount -_scratch_mount >> $seq.full 2>&1 \ +_scratch_mount >> $seqres.full 2>&1 \ || _fail "mount failed" # should now be peaches diff --git a/tests/xfs/182 b/tests/xfs/182 index 33e80109..89444693 100755 --- a/tests/xfs/182 +++ b/tests/xfs/182 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/183 b/tests/xfs/183 index 4624ab4f..4fc16b1f 100755 --- a/tests/xfs/183 +++ b/tests/xfs/183 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/185 b/tests/xfs/185 index 928eb244..29436343 100755 --- a/tests/xfs/185 +++ b/tests/xfs/185 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/186 b/tests/xfs/186 index 2c66026e..d162167e 100755 --- a/tests/xfs/186 +++ b/tests/xfs/186 @@ -34,6 +34,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -77,7 +80,7 @@ _rmv_eas() _filter_inode() { - tee -a $here/$seq.full | \ + tee -a $here/$seqres.full | \ sed -e "s/core.forkoff/forkoff/g" | \ egrep '^u.sfdir2|^a.sfattr|forkoff' | \ egrep -v 'inumber|parent' @@ -85,7 +88,7 @@ _filter_inode() _filter_version() { - tee -a $here/$seq.full | tr ',' '\n' | grep ATTR + tee -a $here/$seqres.full | tr ',' '\n' | grep ATTR } _print_inode() @@ -148,7 +151,7 @@ _supported_os Linux _require_scratch _require_attrs -rm -f $seq.full +rm -f $seqres.full _scratch_mkfs -i attr=2,size=512 -l lazy-count=1 >/dev/null 2>&1 diff --git a/tests/xfs/187 b/tests/xfs/187 index bff0caac..b2b73f0c 100755 --- a/tests/xfs/187 +++ b/tests/xfs/187 @@ -28,6 +28,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -43,7 +46,7 @@ _cleanup() _filter_version() { - tee -a $seq.full | tr ',' '\n' | egrep 'ATTR|MORE|LAZY' + tee -a $seqres.full | tr ',' '\n' | egrep 'ATTR|MORE|LAZY' } # get standard environment, filters and checks @@ -58,7 +61,7 @@ _supported_os Linux _require_scratch _require_attrs -rm -f $seq.full +rm -f $seqres.full # lazysb and attr2 are in features2 and will require morebitsbit on # So test with lazysb and without it to see if the morebitsbit is diff --git a/tests/xfs/188 b/tests/xfs/188 index 4ebbfc18..1ffa4baf 100755 --- a/tests/xfs/188 +++ b/tests/xfs/188 @@ -30,6 +30,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -57,7 +60,7 @@ if [ $XFSPROGS_VERSION -lt 21000 ]; then fi _require_scratch -rm -f $seq.full +rm -f $seqres.full _scratch_mkfs -n version=ci >/dev/null 2>&1 _scratch_mount diff --git a/tests/xfs/189 b/tests/xfs/189 index a5a56828..63a39d7f 100755 --- a/tests/xfs/189 +++ b/tests/xfs/189 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -220,5 +223,5 @@ _test_remount_barrier # success, all done echo "*** done" -rm -f $seq.full +rm -f $seqres.full status=0 diff --git a/tests/xfs/190 b/tests/xfs/190 index 5bb47436..60d8adbc 100755 --- a/tests/xfs/190 +++ b/tests/xfs/190 @@ -35,12 +35,15 @@ filesize=10 filename=test-190 seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ status=0 # success is the default! -rm -f $seq.full +rm -f $seqres.full # get standard environment, filters and checks . ./common.rc @@ -55,20 +58,20 @@ _scratch_mkfs_xfs >/dev/null 2>&1 _scratch_mount fsblocksize=`xfs_info $SCRATCH_MNT|sed 's/=/ /g'|awk '/^data / { print $3 }'` -dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seq.full 2>&1 +dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seqres.full 2>&1 # run DMAPI test using verbose output echo Punching holes in file -echo Punching holes in file >> $seq.full +echo Punching holes in file >> $seqres.full for i in $holes ; do - echo xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename >> $seq.full + echo xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename >> $seqres.full xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename ; done echo Verifying holes are in the correct spots: xfs_bmap=`xfs_bmap $SCRATCH_MNT/$filename` -xfs_bmap $SCRATCH_MNT/$filename >> $seq.full +xfs_bmap $SCRATCH_MNT/$filename >> $seqres.full for i in $holes ; do holeStart=$[`echo $i|$SED_PROG 's/:/ /g'|awk '{print $1}'`]; holeEnd=$[`echo $i|$SED_PROG 's/:/ /g'|awk '{print $2}'`]; @@ -83,7 +86,7 @@ for i in $holes ; do #xfs_bmap prints holes in the following format # 1: [8..15]: hole bmap="\[$[$holeStart/512]..$[($holeEnd/512) -1]\]"; - echo $bmap >> $seq.full + echo $bmap >> $seqres.full if [ $holeEnd == $holeStart ] ; then continue #there is no hole fi diff --git a/tests/xfs/191 b/tests/xfs/191 index 3120dcb0..8e61629c 100755 --- a/tests/xfs/191 +++ b/tests/xfs/191 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -41,7 +44,7 @@ _supported_fs xfs _supported_os Linux _require_scratch -_scratch_mkfs_xfs -i nfs4acl 1>$tmp.mkfs 2>$seq.full +_scratch_mkfs_xfs -i nfs4acl 1>$tmp.mkfs 2>$seqres.full if [ $? -ne 0 ] then _notrun "no mkfs support for NFS v4 ACLs" @@ -53,7 +56,7 @@ then _notrun "no kernel mount support for NFS v4 ACLs" fi -set_prog_path nfs4acl >>$seq.full +set_prog_path nfs4acl >>$seqres.full if [ $? -ne 0 ] then _notrun "no nfs4acl utility found" diff --git a/tests/xfs/194 b/tests/xfs/194 index 595da25a..9d439a6c 100755 --- a/tests/xfs/194 +++ b/tests/xfs/194 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -44,7 +47,7 @@ _supported_fs xfs _supported_os IRIX Linux # real QA test starts here -rm -f $seq.full +rm -f $seqres.full # For this test we use block size = 1/8 page size pgsize=`$here/src/feature -s` @@ -63,7 +66,7 @@ blksize=`expr $pgsize / 8` _filter_bmap() { - tee -a $seq.full | \ + tee -a $seqres.full | \ sed "s#$SCRATCH_MNT#SCRATCH_MNT#g" | \ awk \ '$3 ~ /hole/ { print $1 "\t" $3 "\t" ($4 * 512) / blksize; next } @@ -75,7 +78,7 @@ _filter_bmap() # Filter out offsets, which vary by blocksize _filter_od() { - tee -a $seq.full | \ + tee -a $seqres.full | \ sed -e "s/^[0-9A-Fa-f ]\{7,8\}//" } @@ -118,12 +121,12 @@ xfs_io \ -c "pwrite -S 0x11 -b `expr $pgsize / 2` 0 `expr $pgsize / 2`" \ -c "truncate `expr $blksize / 2`" \ -c "truncate $pgsize" \ --t -f $SCRATCH_MNT/testfile1 >> $seq.full +-t -f $SCRATCH_MNT/testfile1 >> $seqres.full # directio read of entire file xfs_io \ -c "pread 0 $pgsize" \ --d $SCRATCH_MNT/testfile1 >> $seq.full +-d $SCRATCH_MNT/testfile1 >> $seqres.full xfs_bmap -v $SCRATCH_MNT/testfile1 | _filter_bmap od -x $SCRATCH_MNT/testfile1 | _filter_od @@ -137,12 +140,12 @@ xfs_io \ -c "truncate `expr $blksize / 2`" \ -c "truncate $pgsize" \ -c "pwrite -S 0x22 -b $blksize `expr $blksize \* 4` $blksize" \ --t -f $SCRATCH_MNT/testfile2 >> $seq.full +-t -f $SCRATCH_MNT/testfile2 >> $seqres.full # directio read of entire file xfs_io \ -c "pread 0 $pgsize" \ --d $SCRATCH_MNT/testfile2 >> $seq.full +-d $SCRATCH_MNT/testfile2 >> $seqres.full xfs_bmap -v $SCRATCH_MNT/testfile2 | _filter_bmap od -x $SCRATCH_MNT/testfile2 | _filter_od @@ -187,7 +190,7 @@ xfs_io \ -c "truncate `expr $blksize / 2`" \ -c "truncate `expr $blksize + 1`" \ -c "pwrite -S 0x22 -b $blksize `expr $pgsize / 2` $blksize" \ --t -d -f $SCRATCH_MNT/testfile3 >> $seq.full +-t -d -f $SCRATCH_MNT/testfile3 >> $seqres.full xfs_bmap -v $SCRATCH_MNT/testfile3 | _filter_bmap od -x $SCRATCH_MNT/testfile3 | _filter_od @@ -207,7 +210,7 @@ xfs_io \ -c "truncate `expr $blksize + 1`" \ -c "pwrite -S 0x22 -b $blksize `expr $pgsize / 2` $blksize" \ -c "pwrite -S 0x33 -b 512 `expr $blksize \* 2` 512" \ --t -d -f $SCRATCH_MNT/testfile4 >> $seq.full +-t -d -f $SCRATCH_MNT/testfile4 >> $seqres.full xfs_bmap -v $SCRATCH_MNT/testfile4 | _filter_bmap od -x $SCRATCH_MNT/testfile4 | _filter_od diff --git a/tests/xfs/195 b/tests/xfs/195 index cd64db1a..aed24716 100755 --- a/tests/xfs/195 +++ b/tests/xfs/195 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -82,5 +85,5 @@ _do_dump # success, all done echo "*** done" -rm -f $seq.full +rm -f $seqres.full status=0 diff --git a/tests/xfs/196 b/tests/xfs/196 index 321fe472..41353b9b 100755 --- a/tests/xfs/196 +++ b/tests/xfs/196 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -93,5 +96,5 @@ done # success, all done echo "*** done" -rm -f $seq.full +rm -f $seqres.full status=0 diff --git a/tests/xfs/197 b/tests/xfs/197 index 8c2ebd23..b7bb2332 100755 --- a/tests/xfs/197 +++ b/tests/xfs/197 @@ -28,6 +28,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -61,5 +64,5 @@ src/t_dir_offset $TEST_DIR/ttt # success, all done echo "*** done" -rm -f $seq.full +rm -f $seqres.full status=0 diff --git a/tests/xfs/199 b/tests/xfs/199 index 127f3078..c141b81d 100755 --- a/tests/xfs/199 +++ b/tests/xfs/199 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -86,5 +89,5 @@ xfs_db -x $SCRATCH_DEV -c 'sb' -c 'print features2' # success, all done echo "*** done" -rm -f $seq.full +rm -f $seqres.full status=0 diff --git a/tests/xfs/200 b/tests/xfs/200 index 34139cc3..0f8d9ede 100755 --- a/tests/xfs/200 +++ b/tests/xfs/200 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -121,5 +124,5 @@ _scratch_mount -o ro 2>&1 | _filter_scratch # success, all done echo "*** done" -rm -f $seq.full +rm -f $seqres.full status=0 diff --git a/tests/xfs/201 b/tests/xfs/201 index e868d99e..80a65e68 100755 --- a/tests/xfs/201 +++ b/tests/xfs/201 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -94,5 +97,5 @@ sync # success, all done echo "*** done" -rm -f $seq.full +rm -f $seqres.full status=0 diff --git a/tests/xfs/202 b/tests/xfs/202 index 27f9e677..6c82ac00 100755 --- a/tests/xfs/202 +++ b/tests/xfs/202 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -56,5 +59,5 @@ _scratch_xfs_repair -o force_geometry 2>&1 | _filter_repair # success, all done echo "*** done" -rm -f $seq.full +rm -f $seqres.full status=0 diff --git a/tests/xfs/203 b/tests/xfs/203 index ed896005..21ec98ac 100755 --- a/tests/xfs/203 +++ b/tests/xfs/203 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -61,7 +64,7 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 -rm -f $seq.full +rm -f $seqres.full # get standard environment, filters and checks . ./common.rc diff --git a/tests/xfs/205 b/tests/xfs/205 index 7c953dbd..1d64eb7e 100755 --- a/tests/xfs/205 +++ b/tests/xfs/205 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -38,14 +41,14 @@ _supported_os Linux _require_scratch -rm -f $seq.full +rm -f $seqres.full -_scratch_mkfs_xfs -d size=16m -b size=512 >> $seq.full 2>&1 +_scratch_mkfs_xfs -d size=16m -b size=512 >> $seqres.full 2>&1 _scratch_mount # fix the reserve block pool to a known size so that the enospc calculations # work out correctly. -_scratch_resvblks 1024 >> $seq.full 2>&1 +_scratch_resvblks 1024 >> $seqres.full 2>&1 # on a 16MB filesystem, there's 32768x512byte blocks. used is: # - 4944 in the log, diff --git a/tests/xfs/206 b/tests/xfs/206 index 29b1fbf0..785de8f8 100755 --- a/tests/xfs/206 +++ b/tests/xfs/206 @@ -28,6 +28,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -58,7 +61,7 @@ if [ "$bitsperlong" -ne 64 ]; then _notrun "This test is only valid on 64 bit machines" fi -rm -f $seq.full +rm -f $seqres.full tmpfile=$TEST_DIR/fsfile.$$ tmpdir=$TEST_DIR/tmpdir.$$ diff --git a/tests/xfs/216 b/tests/xfs/216 index a997d5a8..c82ea9e8 100755 --- a/tests/xfs/216 +++ b/tests/xfs/216 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/217 b/tests/xfs/217 index b33c2e78..f6c7c736 100755 --- a/tests/xfs/217 +++ b/tests/xfs/217 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/220 b/tests/xfs/220 index 061b395c..3f6503b7 100755 --- a/tests/xfs/220 +++ b/tests/xfs/220 @@ -26,6 +26,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/222 b/tests/xfs/222 index 6b5cf1fa..9a78db56 100755 --- a/tests/xfs/222 +++ b/tests/xfs/222 @@ -26,6 +26,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -49,7 +52,7 @@ _supported_os Linux [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found" -xfs_fsr -d -v $TEST_DIR > $seq.full 2>&1 +xfs_fsr -d -v $TEST_DIR > $seqres.full 2>&1 echo "--- silence is golden ---" status=0 ; exit diff --git a/tests/xfs/227 b/tests/xfs/227 index 8403724d..f988b171 100755 --- a/tests/xfs/227 +++ b/tests/xfs/227 @@ -28,6 +28,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -50,7 +53,7 @@ _supported_fs xfs _supported_os Linux _require_scratch -rm -f $seq.full +rm -f $seqres.full [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found" @@ -152,10 +155,10 @@ create_target_attr_last() create_attrs $nattrs $target } -rm -f $seq.full +rm -f $seqres.full # use a small filesystem so we can control freespace easily -_scratch_mkfs_sized $((50 * 1024 * 1024)) >> $seq.full 2>&1 +_scratch_mkfs_sized $((50 * 1024 * 1024)) >> $seqres.full 2>&1 _scratch_mount fragment_freespace @@ -187,20 +190,20 @@ _scratch_mount targ=$SCRATCH_MNT/fsr_test_file.$$ for n in `seq 4 1 12`; do - echo "*** n == $n ***" >> $seq.full + echo "*** n == $n ***" >> $seqres.full for i in `seq 5 1 15`; do for j in `seq 5 1 20`; do - create_target_attr_first $i $j $targ.$i.$j >> $seq.full 2>&1 + create_target_attr_first $i $j $targ.$i.$j >> $seqres.full 2>&1 done - xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1 - FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seq.full 2>&1 - xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1 + xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1 + FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seqres.full 2>&1 + xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1 for j in `seq 5 1 20`; do - create_target_attr_last $i $j $targ.$i.$j >> $seq.full 2>&1 + create_target_attr_last $i $j $targ.$i.$j >> $seqres.full 2>&1 done - xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1 - FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seq.full 2>&1 - xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1 + xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1 + FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seqres.full 2>&1 + xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1 done done diff --git a/tests/xfs/229 b/tests/xfs/229 index 52be5c37..b34ab1bb 100755 --- a/tests/xfs/229 +++ b/tests/xfs/229 @@ -29,6 +29,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/238 b/tests/xfs/238 index e1a8749f..beff5408 100755 --- a/tests/xfs/238 +++ b/tests/xfs/238 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/242 b/tests/xfs/242 index eb5f9df0..ef6ec20c 100755 --- a/tests/xfs/242 +++ b/tests/xfs/242 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/244 b/tests/xfs/244 index c96d4eb7..9678fc70 100755 --- a/tests/xfs/244 +++ b/tests/xfs/244 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -51,7 +54,7 @@ _require_projid32bit export MOUNT_OPTIONS="-opquota" # make fs with no projid32bit -_scratch_mkfs_xfs -i projid32bit=0 >> $seq.full || _fail "mkfs failed" +_scratch_mkfs_xfs -i projid32bit=0 >> $seqres.full || _fail "mkfs failed" _qmount # make sure project quota is supported _require_prjquota ${SCRATCH_DEV} @@ -68,7 +71,7 @@ mkdir $dir touch $dir/below16bit # below 16bit value $XFS_QUOTA_PROG -x -c "project -s -p $dir/below16bit 3422" $SCRATCH_DEV \ - >> $seq.full + >> $seqres.full projid=$($XFS_IO_PROG -r -c "lsproj" $dir/below16bit) if [ "projid = 3422" != "$projid" ]; then echo "FAIL: projid32bit disabled: returned projid value ($projid)" @@ -79,7 +82,7 @@ fi # 32bit value, should fail touch $dir/over16bit if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over16bit 108545" $SCRATCH_DEV \ - >> $seq.full 2>&1; then + >> $seqres.full 2>&1; then echo "FAIL: projid32bit disabled: setting 32bit projid succeeded" echo " while it should fail" status=1 @@ -87,7 +90,7 @@ fi # over 32bit value, should fail touch $dir/over32bit -if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV >> $seq.full 2>&1; then +if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV >> $seqres.full 2>&1; then echo "FAIL: projid32bit disabled: setting over 32bit projid succeeded" echo " while it should fail" status=1 @@ -95,14 +98,14 @@ fi # Do testing on filesystem with projid32bit feature enabled umount $SCRATCH_DEV 2>/dev/null -_scratch_mkfs_xfs -i projid32bit=1 >> $seq.full || _fail "mkfs failed" +_scratch_mkfs_xfs -i projid32bit=1 >> $seqres.full || _fail "mkfs failed" _qmount mkdir $dir touch $dir/below16bit # below 16bit value, should succeed $XFS_QUOTA_PROG -x -c "project -s -p $dir/below16bit 3422" $SCRATCH_DEV \ - >> $seq.full + >> $seqres.full projid=$($XFS_IO_PROG -r -c "lsproj" $dir/below16bit) if [ "projid = 3422" != "$projid" ]; then echo "FAIL: projid32bit enabled: returned projid value ($projid)" @@ -113,7 +116,7 @@ fi # 32bit value, should succeed touch $dir/over16bit if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over16bit 108545" $SCRATCH_DEV \ - >> $seq.full 2>&1; then + >> $seqres.full 2>&1; then projid=$($XFS_IO_PROG -r -c "lsproj" $dir/over16bit) if [ "projid = 108545" != "$projid" ]; then echo "FAIL: projid32bit enabled: returned projid value ($projid)" @@ -129,7 +132,7 @@ fi # over 32bit value, should fail touch $dir/over32bit if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV \ - >> $seq.full 2>&1; then + >> $seqres.full 2>&1; then echo "FAIL: projid32bit enabled: setting over 32bit projid succeeded" echo " while it should fail" status=1 diff --git a/tests/xfs/250 b/tests/xfs/250 index 2dd12e82..8563b1ea 100755 --- a/tests/xfs/250 +++ b/tests/xfs/250 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/252 b/tests/xfs/252 index 9f0424d9..745f609e 100755 --- a/tests/xfs/252 +++ b/tests/xfs/252 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/253 b/tests/xfs/253 index 64776daf..915bb26a 100755 --- a/tests/xfs/253 +++ b/tests/xfs/253 @@ -33,6 +33,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/259 b/tests/xfs/259 index 91503a0c..47f2cfa4 100755 --- a/tests/xfs/259 +++ b/tests/xfs/259 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" status=1 # failure is the default! diff --git a/tests/xfs/261 b/tests/xfs/261 index 8903ec81..65701769 100755 --- a/tests/xfs/261 +++ b/tests/xfs/261 @@ -26,6 +26,9 @@ # seq=$(basename $0) +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by ${seq}" here=$(pwd) diff --git a/tests/xfs/262 b/tests/xfs/262 index 5a060f12..8ced43f6 100755 --- a/tests/xfs/262 +++ b/tests/xfs/262 @@ -27,6 +27,9 @@ # seq=$(basename $0) +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by ${seq}" here=$(pwd) diff --git a/tests/xfs/266 b/tests/xfs/266 index 89c590f7..41154b76 100755 --- a/tests/xfs/266 +++ b/tests/xfs/266 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/267 b/tests/xfs/267 index c52d8100..09208256 100755 --- a/tests/xfs/267 +++ b/tests/xfs/267 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/268 b/tests/xfs/268 index 36391a34..00a55299 100755 --- a/tests/xfs/268 +++ b/tests/xfs/268 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/278 b/tests/xfs/278 index 559e1741..4e3bbe26 100755 --- a/tests/xfs/278 +++ b/tests/xfs/278 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -60,22 +63,22 @@ _scratch_unmount echo "Silence is goodness..." # Corrupt DIR -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].inumber.i4 0" $SCRATCH_DEV >> $seq.full -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].name 0" $SCRATCH_DEV >> $seq.full -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].offset 0" $SCRATCH_DEV >> $seq.full -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].namelen 0" $SCRATCH_DEV >> $seq.full -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seq.full -xfs_db -x -c "inode $DIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seq.full +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].inumber.i4 0" $SCRATCH_DEV >> $seqres.full +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].name 0" $SCRATCH_DEV >> $seqres.full +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].offset 0" $SCRATCH_DEV >> $seqres.full +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].namelen 0" $SCRATCH_DEV >> $seqres.full +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seqres.full +xfs_db -x -c "inode $DIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seqres.full # Corrupt SUBDIR -xfs_db -x -c "inode $SUBDIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seq.full -xfs_db -x -c "inode $SUBDIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seq.full +xfs_db -x -c "inode $SUBDIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seqres.full +xfs_db -x -c "inode $SUBDIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seqres.full -echo "===== BEGIN of xfs_repair =====" >> $seq.full -echo "" >>$seq.full +echo "===== BEGIN of xfs_repair =====" >> $seqres.full +echo "" >>$seqres.full -xfs_repair $SCRATCH_DEV >> $seq.full 2>&1 -echo "===== END of xfs_repair =====" >> $seq.full +xfs_repair $SCRATCH_DEV >> $seqres.full 2>&1 +echo "===== END of xfs_repair =====" >> $seqres.full #if _check_scratch_fs; then # status=0 diff --git a/tests/xfs/279 b/tests/xfs/279 index 8ee33288..cf6bec38 100755 --- a/tests/xfs/279 +++ b/tests/xfs/279 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -48,7 +51,7 @@ _supported_os Linux _require_scsi_debug -rm -f $seq.full +rm -f $seqres.full # Remove xfs signature so -f isn't needed to re-mkfs _wipe_device() @@ -67,7 +70,7 @@ _check_mkfs() return fi echo "Passed." - cat $tmp.mkfs.full | _filter_mkfs >> $seq.full 2>$tmp.mkfs + cat $tmp.mkfs.full | _filter_mkfs >> $seqres.full 2>$tmp.mkfs . $tmp.mkfs echo "Got sector size: $sectsz" device=`echo $@ | awk '{print $NF}'` @@ -83,7 +86,7 @@ SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 128` _check_mkfs $SCSI_DEBUG_DEV # blocksize smaller than physical sectorsize should revert to logical sectorsize _check_mkfs -b size=2048 -f $SCSI_DEBUG_DEV -) | tee -a $seq.full +) | tee -a $seqres.full _put_scsi_debug_dev # === 4k physical 512b logical unaligned @@ -99,7 +102,7 @@ _check_mkfs -f $SCSI_DEBUG_DEV _check_mkfs -s size=4096 $SCSI_DEBUG_DEV # with 4k sector specified should fall back to logical sector size with force _check_mkfs -s size=4096 -f $SCSI_DEBUG_DEV -) | tee -a $seq.full +) | tee -a $seqres.full _put_scsi_debug_dev # === hard 4k physical / 4k logical @@ -111,7 +114,7 @@ SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 128` _check_mkfs -b size=2048 $SCSI_DEBUG_DEV # sector size smaller than physical sector size should fail _check_mkfs -s size=512 $SCSI_DEBUG_DEV -) | tee -a $seq.full +) | tee -a $seqres.full _put_scsi_debug_dev status=0 diff --git a/tests/xfs/281 b/tests/xfs/281 index 2af3533b..3a8a8542 100755 --- a/tests/xfs/281 +++ b/tests/xfs/281 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/282 b/tests/xfs/282 index 49384087..f57d89eb 100755 --- a/tests/xfs/282 +++ b/tests/xfs/282 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -45,13 +48,13 @@ _require_legacy_v2_format _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2 -src/bstat $SCRATCH_MNT >>$here/$seq.full +src/bstat $SCRATCH_MNT >>$here/$seqres.full echo "*** Level 0 dump, format 2" _do_dump_file -f $tmp.l0 -K _append_dumpdir_fill -src/bstat $SCRATCH_MNT >>$here/$seq.full +src/bstat $SCRATCH_MNT >>$here/$seqres.full echo "*** Level 1 dump, current format" _do_dump_file -l 1 -f $tmp.l1 diff --git a/tests/xfs/283 b/tests/xfs/283 index d1ce8adc..e57701b9 100755 --- a/tests/xfs/283 +++ b/tests/xfs/283 @@ -25,6 +25,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -45,13 +48,13 @@ _require_legacy_v2_format _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2 -src/bstat $SCRATCH_MNT >>$here/$seq.full +src/bstat $SCRATCH_MNT >>$here/$seqres.full echo "*** Level 0 dump, current format" _do_dump_file -f $tmp.l0 _append_dumpdir_fill -src/bstat $SCRATCH_MNT >>$here/$seq.full +src/bstat $SCRATCH_MNT >>$here/$seqres.full echo "*** Level 1 dump, format 2" _do_dump_file -l 1 -f $tmp.l1 -K diff --git a/tests/xfs/287 b/tests/xfs/287 index d55ad112..49eb475e 100644 --- a/tests/xfs/287 +++ b/tests/xfs/287 @@ -24,12 +24,15 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" tmp=/tmp/$$ here=`pwd` status=1 # failure is the default! trap "_cleanup; exit \$status" 0 1 2 3 15 -rm -f $seq.full +rm -f $seqres.full # get standard environment, filters and checks . ./common.rc @@ -57,7 +60,7 @@ _require_scratch _require_projid32bit # create xfs fs without projid32bit ability, will be gained by xfs_admin -_scratch_mkfs_xfs -i projid32bit=0 -d size=200m >> $seq.full \ +_scratch_mkfs_xfs -i projid32bit=0 -d size=200m >> $seqres.full \ || _fail "mkfs failed" _qmount_option "pquota" _qmount @@ -73,9 +76,9 @@ touch $dir/{16,32}bit inode16a=$(ls -i $dir/16bit | cut -d ' ' -f 1) inode32a=$(ls -i $dir/32bit | cut -d ' ' -f 1) $XFS_QUOTA_PROG -x -c "project -s -p $dir/16bit 1234" $SCRATCH_DEV \ - >> $seq.full + >> $seqres.full $XFS_QUOTA_PROG -x -c "project -s -p $dir/32bit 2123456789" $SCRATCH_DEV \ - >> $seq.full 2>&1 + >> $seqres.full 2>&1 echo "No 32bit project quotas:" $XFS_IO_PROG -r -c "lsproj" $dir/16bit @@ -84,13 +87,13 @@ $XFS_IO_PROG -r -c "lsproj" $dir/32bit umount $SCRATCH_MNT # Now, enable projid32bit support by xfs_admin -xfs_admin -p $SCRATCH_DEV >> $seq.full 2>&1 || _fail "xfs_admin failed" +xfs_admin -p $SCRATCH_DEV >> $seqres.full 2>&1 || _fail "xfs_admin failed" # Now mount the fs, 32bit project quotas shall be supported, now _qmount_option "pquota" _qmount $XFS_QUOTA_PROG -x -c "project -s -p $dir/32bit 2123456789" $SCRATCH_DEV \ - >> $seq.full + >> $seqres.full # These will be checked by $seq.out echo "With 32bit project quota support:" @@ -99,7 +102,7 @@ $XFS_IO_PROG -r -c "lsproj" $dir/32bit # Dump the fs to a temporary file rm -f $tmp.dump.img -$XFSDUMP_PROG -f $tmp.dump -L label -M media -l 0 $SCRATCH_MNT >> $seq.full \ +$XFSDUMP_PROG -f $tmp.dump -L label -M media -l 0 $SCRATCH_MNT >> $seqres.full \ || _fail "dump failed" # Prepare the device to restore the dumped file system @@ -109,7 +112,7 @@ restore_dir=$SCRATCH_MNT/restore/pquota mkdir -p $SCRATCH_MNT/restore # Restore -$XFSRESTORE_PROG -f $tmp.dump $SCRATCH_MNT/restore >> $seq.full 2>&1 \ +$XFSRESTORE_PROG -f $tmp.dump $SCRATCH_MNT/restore >> $seqres.full 2>&1 \ || _fail "xfsrestore failed" # Check that they are the same @@ -120,7 +123,7 @@ inode16b=$(ls -i $restore_dir/16bit | cut -d ' ' -f 1) inode32b=$(ls -i $restore_dir/32bit | cut -d ' ' -f 1) inode32v2=$(ls -i $restore_dir/32bitv2 | cut -d ' ' -f 1) $XFS_QUOTA_PROG -x -c "project -s -p $restore_dir/32bitv2 2123456789" \ - $SCRATCH_MNT >> $seq.full + $SCRATCH_MNT >> $seqres.full echo "The restored file system + one additional file:" $XFS_IO_PROG -r -c "lsproj" $restore_dir/16bit $XFS_IO_PROG -r -c "lsproj" $restore_dir/32bit diff --git a/tests/xfs/290 b/tests/xfs/290 index db60e6b0..2a8f138d 100644 --- a/tests/xfs/290 +++ b/tests/xfs/290 @@ -27,6 +27,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/291 b/tests/xfs/291 index 022addc2..03c34eb1 100644 --- a/tests/xfs/291 +++ b/tests/xfs/291 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -43,9 +46,9 @@ _supported_fs xfs _supported_os IRIX Linux # real QA test starts here -rm -f $seq.full +rm -f $seqres.full _require_scratch -_scratch_mkfs_xfs -n size=16k -d size=128m >> $seq.full 2>&1 +_scratch_mkfs_xfs -n size=16k -d size=128m >> $seqres.full 2>&1 _scratch_mount # First we cause very badly fragmented freespace, then @@ -55,21 +58,21 @@ _scratch_mount # Step 1: Cause badly fragmented free space mkdir $SCRATCH_MNT/fragdir for I in `seq 0 27200`; do - (echo data > $SCRATCH_MNT/fragdir/f$I) >> $seq.full 2>&1 + (echo data > $SCRATCH_MNT/fragdir/f$I) >> $seqres.full 2>&1 done sync for I in `seq 0 2 27200`; do - rm -f $SCRATCH_MNT/fragdir/f$I >> $seq.full 2>&1 + rm -f $SCRATCH_MNT/fragdir/f$I >> $seqres.full 2>&1 done sync # Soak up any remaining freespace -xfs_io -f -c "pwrite 0 16m" -c "fsync" $SCRATCH_MNT/space_file.large >> $seq.full 2>&1 +xfs_io -f -c "pwrite 0 16m" -c "fsync" $SCRATCH_MNT/space_file.large >> $seqres.full 2>&1 # Take a look at freespace for any post-mortem on the test _scratch_unmount -xfs_db -c freesp $SCRATCH_DEV >> $seq.full 2>&1 +xfs_db -c freesp $SCRATCH_DEV >> $seqres.full 2>&1 _scratch_mount # Step 2: Make a bunch of (hopefully fragmented) multiblock @@ -111,14 +114,14 @@ done _scratch_unmount # Can xfs_repair and xfs_check cope with this monster? -_scratch_xfs_repair >> $seq.full 2>&1 || _fail "xfs_repair failed" -xfs_check $SCRATCH_DEV >> $seq.full 2>&1 || _fail "xfs_check failed" +_scratch_xfs_repair >> $seqres.full 2>&1 || _fail "xfs_repair failed" +xfs_check $SCRATCH_DEV >> $seqres.full 2>&1 || _fail "xfs_check failed" # Yes they can! Now... # Can xfs_metadump cope with this monster? xfs_metadump $SCRATCH_DEV $tmp.metadump || _fail "xfs_metadump failed" xfs_mdrestore $tmp.metadump $tmp.img || _fail "xfs_mdrestore failed" -xfs_repair $tmp.img >> $seq.full 2>&1 || _fail "xfs_repair of metadump failed" +xfs_repair $tmp.img >> $seqres.full 2>&1 || _fail "xfs_repair of metadump failed" # Yes it can; success, all done status=0 diff --git a/tests/xfs/292 b/tests/xfs/292 index 697e2725..b129965c 100644 --- a/tests/xfs/292 +++ b/tests/xfs/292 @@ -23,6 +23,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/293 b/tests/xfs/293 index c54ca1bc..922f819b 100644 --- a/tests/xfs/293 +++ b/tests/xfs/293 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` diff --git a/tests/xfs/295 b/tests/xfs/295 index 325281ae..af8cf386 100644 --- a/tests/xfs/295 +++ b/tests/xfs/295 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -46,7 +49,7 @@ _supported_fs xfs _supported_os IRIX Linux _require_scratch -rm -f $seq.full +rm -f $seqres.full _scratch_mkfs -l size=2560b >/dev/null 2>&1 @@ -56,7 +59,7 @@ _scratch_mkfs -l size=2560b >/dev/null 2>&1 _scratch_mount echo hello > $SCRATCH_MNT/hello; setfattr -n user.name -v value $SCRATCH_MNT/hello _scratch_unmount -_scratch_xfs_logprint 2>&1 >> $seq.full +_scratch_xfs_logprint 2>&1 >> $seqres.full # Now go for a continued transaction # The trick here is to get a transaction which is exactly the size of a @@ -72,7 +75,7 @@ for I in `seq 0 8192`; do touch $SCRATCH_MNT/tmp$I done _scratch_unmount -_scratch_xfs_logprint 2>&1 >> $seq.full +_scratch_xfs_logprint 2>&1 >> $seqres.full # success, all done status=0 diff --git a/tests/xfs/296 b/tests/xfs/296 index d3ae03d6..a8530f16 100644 --- a/tests/xfs/296 +++ b/tests/xfs/296 @@ -22,6 +22,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -47,7 +50,7 @@ _supported_fs xfs _supported_os Linux _require_scratch -rm -f $seq.full +rm -f $seqres.full _wipe_fs diff --git a/tests/xfs/297 b/tests/xfs/297 index 8664b516..c01046bd 100644 --- a/tests/xfs/297 +++ b/tests/xfs/297 @@ -24,6 +24,9 @@ # seq=`basename $0` +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq +seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here=`pwd` @@ -48,7 +51,7 @@ _supported_os IRIX Linux _require_scratch _require_freeze -rm -f $seq.full +rm -f $seqres.full _scratch_mkfs_xfs -d agcount=16,su=256k,sw=12 -l su=256k,size=2560b >/dev/null 2>&1 _scratch_mount >/dev/null 2>&1 @@ -58,26 +61,26 @@ mkdir -p $STRESS_DIR $FSSTRESS_PROG -d $STRESS_DIR -n 100 -p 1000 $FSSTRESS_AVOID >/dev/null 2>&1 & # Freeze/unfreeze file system randomly -echo "Start freeze/unfreeze randomly" | tee -a $seq.full +echo "Start freeze/unfreeze randomly" | tee -a $seqres.full LOOP=10 while [ $LOOP -gt 0 ];do TIMEOUT=`expr $RANDOM % 5` sleep $TIMEOUT - echo "* Freeze file system after sleeping $TIMEOUT seconds" >>$seq.full + echo "* Freeze file system after sleeping $TIMEOUT seconds" >>$seqres.full xfs_freeze -f $SCRATCH_MNT if [ $? -ne 0 ];then - echo " - Error: freeze filesystem failed" | tee -a $seq.full + echo " - Error: freeze filesystem failed" | tee -a $seqres.full fi TIMEOUT=`expr $RANDOM % 3` sleep $TIMEOUT - echo "* Unfreeze file system after sleeping $TIMEOUT seconds" >>$seq.full + echo "* Unfreeze file system after sleeping $TIMEOUT seconds" >>$seqres.full xfs_freeze -u $SCRATCH_MNT if [ $? -ne 0 ];then - echo " - Error: unfreeze filesystem failed" | tee -a $seq.full + echo " - Error: unfreeze filesystem failed" | tee -a $seqres.full fi let LOOP=$LOOP-1 done -echo "Test done" | tee -a $seq.full +echo "Test done" | tee -a $seqres.full killall -q $FSSTRESS_PROG wait |