From 45768396f017d5173aaa7766661aa034cfc8e8fb Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 5 Feb 2010 11:03:37 -0600 Subject: [PATCH] xfstests: make 053 and 077 generic 053 and 077 can be generic w/ a little tweaking. Also change 077's filler to something more likely to be on a random system under test, and add it to the enospc group. Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig --- 053 | 9 ++++----- 077 | 13 ++++++++----- group | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/053 b/053 index 98644a78..439cbe65 100755 --- a/053 +++ b/053 @@ -38,18 +38,17 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 . ./common.attr # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux -[ ! -x /bin/chacl -a ! -x /usr/bin/chacl ] && _notrun "chacl command not found" - _require_scratch +_acl_requirements _acl_setup_ids _do_die_on_error=y test=$SCRATCH_MNT/test # make filesystem on scratch using the defaults -_do 'make filesystem on $SCRATCH_DEV' '_scratch_mkfs_xfs' +_do 'make filesystem on $SCRATCH_DEV' '_scratch_mkfs' _do 'mount filesytem' '_scratch_mount' # create test files and set acls @@ -84,7 +83,7 @@ list_acls() echo "acls before repair:" list_acls _do 'unmount $SCRATCH_DEV' 'umount $SCRATCH_DEV' -_do 'repair filesystem' '_scratch_xfs_repair' +_do 'repair filesystem' '_check_scratch_fs' _do 'mount filesytem' '_scratch_mount' echo "acls after repair: " list_acls diff --git a/077 b/077 index cdee8da0..a3d93348 100755 --- a/077 +++ b/077 @@ -30,8 +30,8 @@ echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ status=1 -#filler=$here/../../linux -filler=/home/fsgqa/isms/2.4.x-xfs +# Something w/ enough data to fill 50M of fs... +filler=/lib/modules/ _cleanup() { @@ -44,14 +44,16 @@ trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15 # get standard environment, filters and checks . ./common.rc . ./common.filter +. ./common.attr # real QA test starts here -_supported_fs xfs +_supported_fs generic _supported_os Linux -[ ! -d $filler ] && _notrun "No linux directory to source files from" +[ ! -d $filler ] && _notrun "No directory to source files from" _require_scratch +_acl_requirements echo "*** create filesystem" @@ -59,7 +61,8 @@ rm -f $seq.full umount $SCRATCH_DEV >/dev/null 2>&1 echo "*** MKFS ***" >>$seq.full echo "" >>$seq.full -_scratch_mkfs_xfs -dsize=50m >>$seq.full 2>&1 \ +let SIZE=50*1024*1024 +_scratch_mkfs_sized $SIZE >>$seq.full 2>&1 \ || _fail "mkfs failed" _scratch_mount >>$seq.full 2>&1 \ || _fail "mount failed" diff --git a/group b/group index 6b8528f4..c66d965d 100644 --- a/group +++ b/group @@ -187,7 +187,7 @@ deprecated 074 rw udf auto 075 rw udf auto quick 076 metadata rw udf auto quick -077 acl attr auto +077 acl attr auto enospc 078 growfs auto quick 079 acl attr ioctl metadata auto quick 080 rw ioctl -- 2.47.3