mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
small fixups - might help Steves problems with this test failing.
This commit is contained in:
@@ -51,38 +51,32 @@ status=0 # success is the default!
|
|||||||
|
|
||||||
_cleanup()
|
_cleanup()
|
||||||
{
|
{
|
||||||
echo "*** unmount"
|
echo "*** unmount"
|
||||||
umount $SCRATCH_MNT 2>/dev/null
|
umount $SCRATCH_MNT 2>/dev/null
|
||||||
rm -f $tmp.*
|
rm -f $tmp.*
|
||||||
}
|
}
|
||||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||||
|
|
||||||
_s()
|
|
||||||
{
|
|
||||||
echo $2 | attr -s $1 $testfile >/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
_attr()
|
_attr()
|
||||||
{
|
{
|
||||||
attr $* 2>$tmp.err >$tmp.out
|
attr $* 2>$tmp.err >$tmp.out
|
||||||
exit=$?
|
exit=$?
|
||||||
sed "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g; s#$tmp[^ :]*#<TMPFILE>#g;" $tmp.out
|
sed -e "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g; s#$tmp[^ :]*#<TMPFILE>#g;"\
|
||||||
sed "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g; s#$tmp[^ :]*#<TMPFILE>#g;" $tmp.err 1>&2
|
$tmp.out
|
||||||
return $exit
|
sed -e "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g; s#$tmp[^ :]*#<TMPFILE>#g;"\
|
||||||
|
$tmp.err 1>&2
|
||||||
|
return $exit
|
||||||
}
|
}
|
||||||
|
|
||||||
_getfattr()
|
_getfattr()
|
||||||
{
|
{
|
||||||
getfattr $* 2>$tmp.err >$tmp.out
|
getfattr $* 2>$tmp.err >$tmp.out
|
||||||
exit=$?
|
exit=$?
|
||||||
sed "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g; s#$tmp[^ :]*#<TMPFILE>#g;" $tmp.out
|
sed -e "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g; s#$tmp[^ :]*#<TMPFILE>#g;"\
|
||||||
sed "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g; s#$tmp[^ :]*#<TMPFILE>#g;" $tmp.err 1>&2
|
$tmp.out
|
||||||
return $exit
|
sed -e "s#$SCRATCH_MNT[^ .:]*#<TESTFILE>#g; s#$tmp[^ :]*#<TMPFILE>#g;"\
|
||||||
}
|
$tmp.err 1>&2
|
||||||
|
return $exit
|
||||||
_filter_xfsdb2()
|
|
||||||
{
|
|
||||||
sed -e
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# real QA test starts here
|
# real QA test starts here
|
||||||
@@ -93,12 +87,12 @@ umount $SCRATCH_DEV >/dev/null 2>&1
|
|||||||
|
|
||||||
echo "*** mkfs"
|
echo "*** mkfs"
|
||||||
mkfs_xfs $SCRATCH_DEV >/dev/null \
|
mkfs_xfs $SCRATCH_DEV >/dev/null \
|
||||||
|| _fail "mkfs failed"
|
|| _fail "mkfs failed"
|
||||||
|
|
||||||
echo "*** mount FS"
|
echo "*** mount FS"
|
||||||
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >/dev/null \
|
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >/dev/null \
|
||||||
|| _fail "mount failed"
|
|| _fail "mount failed"
|
||||||
|
|
||||||
testfile=$SCRATCH_MNT/testfile
|
testfile=$SCRATCH_MNT/testfile
|
||||||
echo "*** make test file 1"
|
echo "*** make test file 1"
|
||||||
|
|
||||||
@@ -114,7 +108,7 @@ touch $testfile.2
|
|||||||
echo "value_1" | _attr -s "a1" $testfile.2 >/dev/null
|
echo "value_1" | _attr -s "a1" $testfile.2 >/dev/null
|
||||||
echo "value_2" | _attr -s "a2-----" $testfile.2 >/dev/null
|
echo "value_2" | _attr -s "a2-----" $testfile.2 >/dev/null
|
||||||
( echo start ; dd if=/dev/zero bs=65525 count=1 ; echo end ) \
|
( echo start ; dd if=/dev/zero bs=65525 count=1 ; echo end ) \
|
||||||
| _attr -s "a3" $testfile.2 >/dev/null
|
| _attr -s "a3" $testfile.2 >/dev/null
|
||||||
_getfattr --absolute-names $testfile.2
|
_getfattr --absolute-names $testfile.2
|
||||||
|
|
||||||
# print name and size from 1st line of output
|
# print name and size from 1st line of output
|
||||||
@@ -127,11 +121,11 @@ _attr -g "a3" $testfile.2 | tail -3 | wc -c
|
|||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
inum_2=`ls -li $testfile.2 | $AWK_PROG '{ print $1 }'`
|
inum_2=`ls -li $testfile.2 | $AWK_PROG '{ print $1 }'`
|
||||||
|
|
||||||
echo "*** unmount FS"
|
echo "*** unmount FS"
|
||||||
umount $SCRATCH_DEV >>$seq.full 2>&1 \
|
umount $SCRATCH_DEV >>$seq.full 2>&1 \
|
||||||
|| _fail "umount failed"
|
|| _fail "umount failed"
|
||||||
|
|
||||||
echo "*** dump attributes (1)"
|
echo "*** dump attributes (1)"
|
||||||
|
|
||||||
xfs_db -r -c "inode $inum_1" -c "print a.sfattr" $SCRATCH_DEV
|
xfs_db -r -c "inode $inum_1" -c "print a.sfattr" $SCRATCH_DEV
|
||||||
@@ -139,11 +133,11 @@ xfs_db -r -c "inode $inum_1" -c "print a.sfattr" $SCRATCH_DEV
|
|||||||
echo "*** dump attributes (2)"
|
echo "*** dump attributes (2)"
|
||||||
|
|
||||||
xfs_db -r -c "inode $inum_2" -c "a a.bmx[0].startblock" -c print $SCRATCH_DEV \
|
xfs_db -r -c "inode $inum_2" -c "a a.bmx[0].startblock" -c print $SCRATCH_DEV \
|
||||||
| perl -ne '
|
| perl -ne '
|
||||||
s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/;
|
s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/;
|
||||||
s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/;
|
s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/;
|
||||||
s/^(entries\[0-2] = \[hashval,nameidx,incomplete,root,local]).*/\1 [ENTRIES..]/;
|
s/^(entries\[0-2] = \[hashval,nameidx,incomplete,root,local]).*/\1 [ENTRIES..]/;
|
||||||
print;'
|
print;'
|
||||||
|
|
||||||
echo "*** done"
|
echo "*** done"
|
||||||
exit
|
exit
|
||||||
|
|||||||
Reference in New Issue
Block a user