apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

tidy mkfs parameterisation, -f option pulled into common.rc.

Browse Source
This commit is contained in:
fsgqa
2002-05-06 07:44:22 +00:00
parent fe932fdad3
commit f29425d6f7
29 changed files with 94 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
004
+1 -1
View File
@@ -56,7 +56,7 @@ trap "_cleanup" 0 1 2 3 15
_populate_scratch() _populate_scratch()
{ {
mkfs_xfs -f $SCRATCH_DEV >/dev/null 2>&1 mkfs_xfs $SCRATCH_DEV >/dev/null 2>&1
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT mount -t xfs $SCRATCH_DEV $SCRATCH_MNT
dd if=/dev/zero of=$SCRATCH_MNT/foo count=200 bs=4096 >/dev/null 2>&1 & dd if=/dev/zero of=$SCRATCH_MNT/foo count=200 bs=4096 >/dev/null 2>&1 &
dd if=/dev/zero of=$SCRATCH_MNT/goo count=400 bs=4096 >/dev/null 2>&1 & dd if=/dev/zero of=$SCRATCH_MNT/goo count=400 bs=4096 >/dev/null 2>&1 &
009
+1 -1
View File
@@ -64,7 +64,7 @@ _block_filter()
_init() _init()
{ {
echo "*** mkfs" echo "*** mkfs"
if ! mkfs_xfs -f $SCRATCH_DEV >$tmp.out 2>&1 if ! mkfs_xfs $SCRATCH_DEV >$tmp.out 2>&1
then then
cat $tmp.out cat $tmp.out
echo "failed to mkfs $SCRATCH_DEV" echo "failed to mkfs $SCRATCH_DEV"
015
+1 -1
View File
@@ -76,7 +76,7 @@ _filter_dd()
# real QA test starts here # real QA test starts here
_require_scratch _require_scratch
mkfs_xfs -f -d size=50m $SCRATCH_DEV >/dev/null mkfs_xfs -d size=50m $SCRATCH_DEV >/dev/null
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT mount -t xfs $SCRATCH_DEV $SCRATCH_MNT
out=$SCRATCH_MNT/fillup.$$ out=$SCRATCH_MNT/fillup.$$
rm -f $seq.full rm -f $seq.full
016
+3 -3
View File
@@ -77,9 +77,9 @@ _init()
echo "*** reset partition" echo "*** reset partition"
$here/src/devzero -b 2048 -n 50 -v 198 $SCRATCH_DEV $here/src/devzero -b 2048 -n 50 -v 198 $SCRATCH_DEV
echo "*** mkfs" echo "*** mkfs"
if ! mkfs_xfs -f -d size=50m -l size=512b $SCRATCH_DEV >$tmp.out 2>&1 if ! mkfs_xfs -dsize=50m -lsize=512b $SCRATCH_DEV >$tmp.out 2>&1
then then
cat $tmp.out cat $tmp.out
echo "failed to mkfs $SCRATCH_DEV" echo "failed to mkfs $SCRATCH_DEV"
exit 1 exit 1
fi fi
@@ -93,7 +93,7 @@ _log_traffic()
out=$SCRATCH_MNT/$$.tmp out=$SCRATCH_MNT/$$.tmp
echo " *** mount" echo " *** mount"
if ! mount $SCRATCH_DEV $SCRATCH_MNT -t xfs if ! mount -t xfs $SCRATCH_DEV $SCRATCH_MNT
then then
echo "failed to mount $SCRATCH_DEV" echo "failed to mount $SCRATCH_DEV"
exit 1 exit 1
017
+1 -1
View File
@@ -76,7 +76,7 @@ rm -f $seq.full
umount $SCRATCH_DEV >/dev/null 2>&1 umount $SCRATCH_DEV >/dev/null 2>&1
echo "*** MKFS ***" >>$seq.full echo "*** MKFS ***" >>$seq.full
echo "" >>$seq.full echo "" >>$seq.full
mkfs_xfs -f $SCRATCH_DEV >>$seq.full 2>&1 \ mkfs_xfs $SCRATCH_DEV >>$seq.full 2>&1 \
|| _fail "mkfs failed" || _fail "mkfs failed"
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full 2>&1 \ mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full 2>&1 \
|| _fail "mount failed" || _fail "mount failed"
018
+1 -1
View File
@@ -122,7 +122,7 @@ rm -f $seq.out $seq.full
umount $SCRATCH_DEV >/dev/null 2>&1 umount $SCRATCH_DEV >/dev/null 2>&1
_full "mkfs" _full "mkfs"
mkfs_xfs -f -lsize=2000b $SCRATCH_DEV >>$seq.full 2>&1 \ mkfs_xfs -lsize=2000b $SCRATCH_DEV >>$seq.full 2>&1 \
|| _fail "mkfs failed" || _fail "mkfs failed"
_full " mount" _full " mount"
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full 2>&1 \ mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full 2>&1 \
019
+5 -4
View File
@@ -73,6 +73,7 @@ _filter_stat()
/^Change:/d; /^Change:/d;
s/Device: *[0-9][0-9]*,[0-9][0-9]*/Device: <DEVICE>/; s/Device: *[0-9][0-9]*,[0-9][0-9]*/Device: <DEVICE>/;
s/Inode: *[0-9][0-9]*/Inode: <INODE>/; s/Inode: *[0-9][0-9]*/Inode: <INODE>/;
s/Size: *[0-9][0-9]* *Filetype: Dir/Size: <DSIZE> Filetype: Dir/;
' | tr -s ' ' ' | tr -s ' '
} }
@@ -127,9 +128,9 @@ _verify_fs()
umount $SCRATCH_DEV >/dev/null 2>&1 umount $SCRATCH_DEV >/dev/null 2>&1
_full "mkfs" _full "mkfs"
mkfs_xfs -f $VERSION -p $protofile $SCRATCH_DEV >>$seqfull 2>&1 \ mkfs_xfs $VERSION -p $protofile $SCRATCH_DEV >>$seqfull 2>&1 \
|| _fail "mkfs failed" || _fail "mount failed"
echo "*** check FS" echo "*** check FS"
_check_fs $SCRATCH_DEV _check_fs $SCRATCH_DEV
@@ -137,7 +138,7 @@ _verify_fs()
_full " mount" _full " mount"
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seqfull 2>&1 \ mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seqfull 2>&1 \
|| _fail "mount failed" || _fail "mount failed"
echo "*** verify FS" echo "*** verify FS"
(cd $SCRATCH_MNT ; find . | sort \ (cd $SCRATCH_MNT ; find . | sort \
| xargs $here/src/lstat64 | _filter_stat) | xargs $here/src/lstat64 | _filter_stat)
019.out
+4 -4
View File
@@ -5,7 +5,7 @@ Wrote 2048.00Kb (value 0x2c)
*** mount FS *** mount FS
*** verify FS *** verify FS
File: "." File: "."
Size: 4096 Filetype: Directory Size: <DSIZE> Filetype: Directory
Mode: (0777/drwxrwxrwx) Uid: (3) Gid: (1) Mode: (0777/drwxrwxrwx) Uid: (3) Gid: (1)
Device: <DEVICE> Inode: <INODE> Links: 3 Device: <DEVICE> Inode: <INODE> Links: 3
@@ -25,7 +25,7 @@ Device: <DEVICE> Inode: <INODE> Links: 1 Device type: 161,162
Device: <DEVICE> Inode: <INODE> Links: 1 Device type: 177,178 Device: <DEVICE> Inode: <INODE> Links: 1 Device type: 177,178
File: "./directory" File: "./directory"
Size: 4096 Filetype: Directory Size: <DSIZE> Filetype: Directory
Mode: (0755/drwxr-xr-x) Uid: (3) Gid: (1) Mode: (0755/drwxr-xr-x) Uid: (3) Gid: (1)
Device: <DEVICE> Inode: <INODE> Links: 2 Device: <DEVICE> Inode: <INODE> Links: 2
@@ -85,7 +85,7 @@ Device: <DEVICE> Inode: <INODE> Links: 1
*** mount FS *** mount FS
*** verify FS *** verify FS
File: "." File: "."
Size: 138 Filetype: Directory Size: <DSIZE> Filetype: Directory
Mode: (0777/drwxrwxrwx) Uid: (3) Gid: (1) Mode: (0777/drwxrwxrwx) Uid: (3) Gid: (1)
Device: <DEVICE> Inode: <INODE> Links: 3 Device: <DEVICE> Inode: <INODE> Links: 3
@@ -105,7 +105,7 @@ Device: <DEVICE> Inode: <INODE> Links: 1 Device type: 161,162
Device: <DEVICE> Inode: <INODE> Links: 1 Device type: 177,178 Device: <DEVICE> Inode: <INODE> Links: 1 Device type: 177,178
File: "./directory" File: "./directory"
Size: 4096 Filetype: Directory Size: <DSIZE> Filetype: Directory
Mode: (0755/drwxr-xr-x) Uid: (3) Gid: (1) Mode: (0755/drwxr-xr-x) Uid: (3) Gid: (1)
Device: <DEVICE> Inode: <INODE> Links: 2 Device: <DEVICE> Inode: <INODE> Links: 2
021
+2 -5
View File
@@ -81,16 +81,13 @@ _getfattr()
} }
# real QA test starts here # real QA test starts here
_require_scratch _require_scratch
echo "*** mkfs"
rm -f $seq.full rm -f $seq.full
umount $SCRATCH_DEV >/dev/null 2>&1 umount $SCRATCH_DEV >/dev/null 2>&1
mkfs_xfs -f $SCRATCH_DEV >/dev/null \ echo "*** mkfs"
mkfs_xfs $SCRATCH_DEV >/dev/null \
|| _fail "mkfs failed" || _fail "mkfs failed"
echo "*** mount FS" echo "*** mount FS"
029
+2 -2
View File
@@ -55,6 +55,7 @@ mkfs_args=""
logp_args="" logp_args=""
if [ ! -z "$SCRATCH_LOGDEV" ] # test external log if possible if [ ! -z "$SCRATCH_LOGDEV" ] # test external log if possible
then then
_require_logdev
mkfs_args="-l logdev=$SCRATCH_LOGDEV,size=1200b" mkfs_args="-l logdev=$SCRATCH_LOGDEV,size=1200b"
logp_args="-l $SCRATCH_LOGDEV" logp_args="-l $SCRATCH_LOGDEV"
fi fi
@@ -72,11 +73,10 @@ _filter_logprint()
} }
# real QA test starts here # real QA test starts here
#
_require_scratch _require_scratch
echo echo
mkfs_xfs -f $mkfs_args $SCRATCH_DEV | _filter_mkfs 2>/dev/null mkfs_xfs $mkfs_args $SCRATCH_DEV | _filter_mkfs 2>/dev/null
echo echo
xfs_logprint $logp_args $SCRATCH_DEV | _filter_logprint xfs_logprint $logp_args $SCRATCH_DEV | _filter_logprint
030
+5 -3
View File
@@ -73,12 +73,14 @@ _check_ag()
# real QA test starts here # real QA test starts here
_require_scratch _require_scratch
DSIZE="-dsize=100m"
# first we need to ensure there are no bogus secondary # first we need to ensure there are no bogus secondary
# superblocks between the primary and first secondary # superblocks between the primary and first secondary
# superblock (hanging around from earlier tests)... # superblock (hanging around from earlier tests)...
# #
size="-d size=100m"
mkfs_xfs -f $size $SCRATCH_DEV >/dev/null 2>&1 mkfs_xfs $DSIZE $SCRATCH_DEV >/dev/null 2>&1
if [ $? -ne 0 ] # probably don't have a big enough scratch if [ $? -ne 0 ] # probably don't have a big enough scratch
then then
_notrun "SCRATCH_DEV too small, results would be non-deterministic" _notrun "SCRATCH_DEV too small, results would be non-deterministic"
@@ -100,7 +102,7 @@ src/devzero -v -1 -n "$clear" $SCRATCH_DEV >/dev/null
# now kick off the real repair test... # now kick off the real repair test...
# #
mkfs_xfs -f $size $SCRATCH_DEV | _filter_mkfs 2>$tmp.mkfs mkfs_xfs $DSIZE $SCRATCH_DEV | _filter_mkfs 2>$tmp.mkfs
source $tmp.mkfs source $tmp.mkfs
_check_ag 0 _check_ag 0
_check_ag -1 _check_ag -1
031
+2 -2
View File
@@ -98,8 +98,8 @@ EOF
# #
_require_scratch _require_scratch
MKFSV1="-f -p $tmp.proto -n version=1 $SCRATCH_DEV" MKFSV1="-p $tmp.proto -n version=1 $SCRATCH_DEV"
MKFSV2="-f -p $tmp.proto -n version=2 $SCRATCH_DEV" MKFSV2="-p $tmp.proto -n version=2 $SCRATCH_DEV"
# sanity test - default + one root directory entry # sanity test - default + one root directory entry
_create_proto 0 _create_proto 0
032
+1 -1
View File
@@ -79,7 +79,7 @@ do
# next, ensure we don't overwrite it # next, ensure we don't overwrite it
echo "=== Attempting XFS overwrite of $fs..." >>$seq.full echo "=== Attempting XFS overwrite of $fs..." >>$seq.full
mkfs_xfs $SCRATCH_DEV >>$seq.full 2>&1 /sbin/mkfs.xfs $SCRATCH_DEV >>$seq.full 2>&1
[ $? -eq 0 ] && echo "Failed - overwrote fs type ${fs}!" [ $? -eq 0 ] && echo "Failed - overwrote fs type ${fs}!"
done done
033
+1 -1
View File
@@ -75,7 +75,7 @@ _check_root_inos()
_require_scratch _require_scratch
# devzero blows away 512byte blocks, so make 512byte inodes # devzero blows away 512byte blocks, so make 512byte inodes
mkfs_xfs -f -i size=512 $SCRATCH_DEV | _filter_mkfs 2>/dev/null mkfs_xfs -isize=512 $SCRATCH_DEV | _filter_mkfs 2>/dev/null
`xfs_db -r -c sb -c p $SCRATCH_DEV | grep 'ino = ' | \ `xfs_db -r -c sb -c p $SCRATCH_DEV | grep 'ino = ' | \
sed -e 's/ //g' -e 's/^/export /'` sed -e 's/ //g' -e 's/^/export /'`
034
+1 -1
View File
@@ -67,7 +67,7 @@ rm -f $seq.full
umount $SCRATCH_DEV >/dev/null 2>&1 umount $SCRATCH_DEV >/dev/null 2>&1
echo "*** MKFS ***" >>$seq.full echo "*** MKFS ***" >>$seq.full
echo "" >>$seq.full echo "" >>$seq.full
mkfs_xfs -f $SCRATCH_DEV >>$seq.full 2>&1 \ mkfs_xfs $SCRATCH_DEV >>$seq.full 2>&1 \
|| _fail "mkfs failed" || _fail "mkfs failed"
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full 2>&1 \ mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full 2>&1 \
|| _fail "mount failed" || _fail "mount failed"
041
+1 -1
View File
@@ -75,7 +75,7 @@ rm -f $seq.full
#agsize=16 #agsize=16
agsize=32 agsize=32
echo -n "Make $agsize megabyte filesystem on SCRATCH_DEV and mount... " echo -n "Make $agsize megabyte filesystem on SCRATCH_DEV and mount... "
_do "mkfs_xfs -d size=${agsize}m,agcount=1 -l internal -f $SCRATCH_DEV" _do "mkfs_xfs -dsize=${agsize}m,agcount=1 $SCRATCH_DEV"
_do "mount -t xfs $SCRATCH_DEV $SCRATCH_MNT" _do "mount -t xfs $SCRATCH_DEV $SCRATCH_MNT"
echo "done" echo "done"
042
+1 -1
View File
@@ -105,7 +105,7 @@ mnt_cmd="mount -t xfs $SCRATCH_DEV $SCRATCH_MNT"
_do_die_on_error=message_only _do_die_on_error=message_only
echo -n "Make a 48 megabyte filesystem on SCRATCH_DEV and mount... " echo -n "Make a 48 megabyte filesystem on SCRATCH_DEV and mount... "
_do "mkfs_xfs -d size=48m,agcount=3 -l internal -f $SCRATCH_DEV" _do "mkfs_xfs -dsize=48m,agcount=3 $SCRATCH_DEV"
_do "$mnt_cmd" _do "$mnt_cmd"
echo "done" echo "done"
044
+1 -1
View File
@@ -125,7 +125,7 @@ _require_scratch
echo -e -n "\n\r*** XFS QA 044 - expect mount failure messages\n\r\n\r" >/dev/console echo -e -n "\n\r*** XFS QA 044 - expect mount failure messages\n\r\n\r" >/dev/console
echo "*** mkfs" echo "*** mkfs"
mkfs_xfs -f -l logdev=$SCRATCH_LOGDEV,size=4096b $SCRATCH_DEV | _filter_mkfs 2>/dev/null mkfs_xfs -llogdev=$SCRATCH_LOGDEV,size=4096b $SCRATCH_DEV | _filter_mkfs 2>/dev/null
_check_mount _check_mount
_check_require_logdev _check_require_logdev
045
+1 -1
View File
@@ -65,7 +65,7 @@ _require_scratch
echo "*** get uuid" echo "*** get uuid"
uuid=`_get_uuid $TEST_DEV` uuid=`_get_uuid $TEST_DEV`
echo "*** mkfs" echo "*** mkfs"
if ! mkfs_xfs -f $SCRATCH_DEV >$tmp.out 2>&1 if ! mkfs_xfs $SCRATCH_DEV >$tmp.out 2>&1
then then
cat $tmp.out cat $tmp.out
echo "!!! failed to mkfs on $SCRATCH_DEV" echo "!!! failed to mkfs on $SCRATCH_DEV"
049
+1 -1
View File
@@ -92,7 +92,7 @@ mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seq.full 2>&1 \
|| _fail "!!! failed to mount" || _fail "!!! failed to mount"
_log "Create xfs fs in file on scratch" _log "Create xfs fs in file on scratch"
mkfs_xfs -d file,name=$SCRATCH_MNT/test.xfs,size=20m >> $seq.full 2>&1 \ mkfs_xfs -dfile,name=$SCRATCH_MNT/test.xfs,size=20m >> $seq.full 2>&1 \
|| _fail "!!! failed to mkfs xfs" || _fail "!!! failed to mkfs xfs"
_log "Make mount points" _log "Make mount points"

Some files were not shown because too many files have changed in this diff Show More