mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
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>
This commit is contained in:
Dave Chinner
committed by
Rich Johnston
Rich Johnston
parent
1686f9abfc
commit
1d5d46db80
@@ -23,6 +23,10 @@
|
||||
#
|
||||
|
||||
seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
|
||||
@@ -23,6 +23,10 @@
|
||||
#
|
||||
|
||||
seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
|
||||
@@ -22,6 +22,10 @@
|
||||
#
|
||||
|
||||
seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
|
||||
+21
-17
@@ -26,6 +26,10 @@
|
||||
#
|
||||
|
||||
seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
@@ -36,7 +40,7 @@ noise_pid=0
|
||||
_cleanup()
|
||||
{
|
||||
if [ $noise_pid -ne 0 ]; then
|
||||
echo "background noise kill $noise_pid" >>$seq.full
|
||||
echo "background noise kill $noise_pid" >>$seqres.full
|
||||
kill $noise_pid
|
||||
noise_pid=0
|
||||
wait
|
||||
@@ -60,7 +64,7 @@ _require_no_large_scratch_dev
|
||||
_require_btrfs inspect-internal
|
||||
_require_command "/usr/sbin/filefrag"
|
||||
|
||||
rm -f $seq.full
|
||||
rm -f $seqres.full
|
||||
|
||||
FILEFRAG_FILTER='if (/, blocksize (\d+)/) {$blocksize = $1; next} ($ext, '\
|
||||
'$logical, $physical, $expected, $length, $flags) = (/^\s*(\d+)\s+(\d+)'\
|
||||
@@ -74,18 +78,18 @@ FILEFRAG_FILTER='if (/, blocksize (\d+)/) {$blocksize = $1; next} ($ext, '\
|
||||
# sample output: "1234#10#5678" -> physical 1234, length 10, logical 5678
|
||||
_filter_extents()
|
||||
{
|
||||
tee -a $seq.full | $PERL_PROG -ne "$FILEFRAG_FILTER"
|
||||
tee -a $seqres.full | $PERL_PROG -ne "$FILEFRAG_FILTER"
|
||||
}
|
||||
|
||||
_check_file_extents()
|
||||
{
|
||||
cmd="filefrag -v $1"
|
||||
echo "# $cmd" >> $seq.full
|
||||
echo "# $cmd" >> $seqres.full
|
||||
out=`$cmd | _filter_extents`
|
||||
if [ -z "$out" ]; then
|
||||
return 1
|
||||
fi
|
||||
echo "after filter: $out" >> $seq.full
|
||||
echo "after filter: $out" >> $seqres.full
|
||||
echo $out
|
||||
return 0
|
||||
}
|
||||
@@ -101,9 +105,9 @@ _btrfs_inspect_addr()
|
||||
expect_inum=$4
|
||||
file=$5
|
||||
cmd="$BTRFS_UTIL_PROG inspect-internal logical-resolve -P $addr $mp"
|
||||
echo "# $cmd" >> $seq.full
|
||||
echo "# $cmd" >> $seqres.full
|
||||
out=`$cmd`
|
||||
echo "$out" >> $seq.full
|
||||
echo "$out" >> $seqres.full
|
||||
grep_expr="inode $expect_inum offset $expect_addr root"
|
||||
echo "$out" | grep "^$grep_expr 5$" >/dev/null
|
||||
ret=$?
|
||||
@@ -134,9 +138,9 @@ _btrfs_inspect_inum()
|
||||
snap_name=$3
|
||||
mp="$SCRATCH_MNT/$snap_name"
|
||||
cmd="$BTRFS_UTIL_PROG inspect-internal inode-resolve $inum $mp"
|
||||
echo "# $cmd" >> $seq.full
|
||||
echo "# $cmd" >> $seqres.full
|
||||
out=`$cmd`
|
||||
echo "$out" >> $seq.full
|
||||
echo "$out" >> $seqres.full
|
||||
grep_expr="^$file$"
|
||||
cnt=`echo "$out" | grep "$grep_expr" | wc -l`
|
||||
if [ $cnt -ge "1" ]; then
|
||||
@@ -157,9 +161,9 @@ _btrfs_inspect_check()
|
||||
logical=$4
|
||||
snap_name=$5
|
||||
cmd="stat -c %i $file"
|
||||
echo "# $cmd" >> $seq.full
|
||||
echo "# $cmd" >> $seqres.full
|
||||
inum=`$cmd`
|
||||
echo "$inum" >> $seq.full
|
||||
echo "$inum" >> $seqres.full
|
||||
_btrfs_inspect_addr $SCRATCH_MNT $physical $logical $inum $file
|
||||
ret=$?
|
||||
if [ $ret -eq 0 ]; then
|
||||
@@ -178,9 +182,9 @@ workout()
|
||||
do_bg_noise=$5
|
||||
|
||||
umount $SCRATCH_DEV >/dev/null 2>&1
|
||||
echo "*** mkfs -dsize=$fsz" >>$seq.full
|
||||
echo "" >>$seq.full
|
||||
_scratch_mkfs_sized $fsz >>$seq.full 2>&1 \
|
||||
echo "*** mkfs -dsize=$fsz" >>$seqres.full
|
||||
echo "" >>$seqres.full
|
||||
_scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \
|
||||
|| _fail "size=$fsz mkfs failed"
|
||||
run_check _scratch_mount
|
||||
# -w ensures that the only ops are ones which cause write I/O
|
||||
@@ -210,13 +214,13 @@ workout()
|
||||
if [ $do_bg_noise -ne 0 ]; then
|
||||
# make background noise while backrefs are being walked
|
||||
while /bin/true; do
|
||||
echo background fsstress >>$seq.full
|
||||
echo background fsstress >>$seqres.full
|
||||
run_check $FSSTRESS_PROG -d $SCRATCH_MNT/bgnoise -n 999
|
||||
echo background rm >>$seq.full
|
||||
echo background rm >>$seqres.full
|
||||
rm -rf $SCRATCH_MNT/bgnoise/
|
||||
done &
|
||||
noise_pid=`jobs -p %1`
|
||||
echo "background noise by $noise_pid" >>$seq.full
|
||||
echo "background noise by $noise_pid" >>$seqres.full
|
||||
fi
|
||||
|
||||
cnt=0
|
||||
|
||||
@@ -22,6 +22,10 @@
|
||||
#
|
||||
|
||||
seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "QA output created by $seq"
|
||||
here="`pwd`"
|
||||
tmp=/tmp/$$
|
||||
|
||||
+8
-4
@@ -23,6 +23,10 @@
|
||||
#
|
||||
|
||||
seq=`basename $0`
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
seqres=$RESULT_DIR/$seq
|
||||
echo "== QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
@@ -48,16 +52,16 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
_require_scratch_dev_pool
|
||||
|
||||
rm -f $seq.full
|
||||
rm -f $seqres.full
|
||||
|
||||
FIRST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
|
||||
LAST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'`
|
||||
TOTAL_DEVS=`echo $SCRATCH_DEV $SCRATCH_DEV_POOL | wc -w`
|
||||
LABEL=TestLabel.$seq
|
||||
|
||||
echo "Scratch $SCRATCH_DEV First $FIRST_POOL_DEV last $LAST_POOL_DEV Total $TOTAL_DEVS" > $seq.full
|
||||
echo "Scratch $SCRATCH_DEV First $FIRST_POOL_DEV last $LAST_POOL_DEV Total $TOTAL_DEVS" > $seqres.full
|
||||
|
||||
_scratch_mkfs $SCRATCH_DEV_POOL >> $seq.full 2>&1 || _fail "mkfs failed"
|
||||
_scratch_mkfs $SCRATCH_DEV_POOL >> $seqres.full 2>&1 || _fail "mkfs failed"
|
||||
|
||||
# These have to be done unmounted...?
|
||||
echo "== Set filesystem label to $LABEL"
|
||||
@@ -72,7 +76,7 @@ echo "== Show filesystem by label"
|
||||
$BTRFS_UTIL_PROG filesystem show $LABEL | _filter_btrfs_filesystem_show $TOTAL_DEVS
|
||||
UUID=`$BTRFS_UTIL_PROG filesystem show $LABEL | grep uuid: | awk '{print $NF}'`
|
||||
|
||||
echo "UUID $UUID" >> $seq.full
|
||||
echo "UUID $UUID" >> $seqres.full
|
||||
|
||||
echo "== Show filesystem by UUID"
|
||||
$BTRFS_UTIL_PROG filesystem show $UUID | _filter_btrfs_filesystem_show $TOTAL_DEVS $UUID
|
||||
|
||||
Reference in New Issue
Block a user