mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
fstests: fix broken _require_scratch usage
_require_scratch doesn't actually format the scratch device with anything, which means that tests are required to format them before using them. Fix tests that don't do this correctly. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Eryu Guan <guaneryu@gmail.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
committed by
Eryu Guan
parent
c2cda723f6
commit
8309b39a8a
@@ -32,7 +32,6 @@ _cleanup()
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
_require_test
|
||||
_require_scratch
|
||||
_acl_setup_ids
|
||||
_require_acls
|
||||
_require_acl_get_max
|
||||
|
||||
@@ -52,9 +52,6 @@ _populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$seqres
|
||||
# Then tar up the directory structure
|
||||
tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$seqres.full 2>&1
|
||||
|
||||
# create f/s
|
||||
_require_scratch
|
||||
|
||||
# untar on f/s
|
||||
cd $TEST_DIR
|
||||
tar -xvf $TEMP_DIR/$TAR_FILE >>$seqres.full 2>&1
|
||||
|
||||
+1
-1
@@ -46,12 +46,12 @@ _supported_os Linux
|
||||
_require_command "$LSATTR_PROG" lsattr
|
||||
_require_command "$CHATTR_PROG" chattr
|
||||
|
||||
_require_prjquota $SCRATCH_DEV
|
||||
_require_scratch
|
||||
_require_scratch_shutdown
|
||||
|
||||
_scratch_mkfs >/dev/null 2>&1
|
||||
_require_metadata_journaling $SCRATCH_DEV
|
||||
_require_prjquota $SCRATCH_DEV
|
||||
|
||||
testfile=$SCRATCH_MNT/testfile
|
||||
|
||||
|
||||
Reference in New Issue
Block a user