[PATCH] xfstests: make 053 and 077 generic

[PATCH] xfstests: make 053 and 077 generic

[Eric Sandeen]

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 <sandeen@sandeen.net>
---

diff --git a/053 b/053
index 98644a7..5542885 100755
--- a/053
+++ b/053
@@ -38,18 +38,19 @@ 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 +85,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 cdee8da..d23305f 100755
--- a/077
+++ b/077
@@ -31,7 +31,8 @@ here=`pwd`
 tmp=/tmp/$$
 status=1
 #filler=$here/../../linux
-filler=/home/fsgqa/isms/2.4.x-xfs
+#filler=/home/fsgqa/isms/2.4.x-xfs
+filler=/lib/modules/`uname -r`/
 
 _cleanup()
 {
@@ -44,14 +45,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"
 
 _require_scratch
+_acl_requirements
 
 echo "*** create filesystem"
 
@@ -59,7 +62,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 6b8528f..c66d965 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

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: make 053 and 077 generic

[Christoph Hellwig]

On Thu, Jan 28, 2010 at 05:30:25PM -0600, Eric Sandeen wrote:
> 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 <sandeen@sandeen.net>
> ---
> 
> diff --git a/053 b/053
> index 98644a7..5542885 100755
> --- a/053
> +++ b/053
> @@ -38,18 +38,19 @@ 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_requirements includes the chacl check, so it can be removed.

Btw, any reason _acl_requirements isn't called _require_acl?

> diff --git a/077 b/077
> index cdee8da..d23305f 100755
> --- a/077
> +++ b/077
> @@ -31,7 +31,8 @@ here=`pwd`
>  tmp=/tmp/$$
>  status=1
>  #filler=$here/../../linux
> -filler=/home/fsgqa/isms/2.4.x-xfs
> +#filler=/home/fsgqa/isms/2.4.x-xfs
> +filler=/lib/modules/`uname -r`/

Oooops.  Maybe just use /lib/modules/ to get as much as possible.
And no need to let the other bits comment out there.  Maybe we need
to generate the data instead to really be safe - at least for my
tests under qemu I don't have any modules installed.  But that should
be left for another patch.

Anyway, patch looks good enough to go in for now, so


Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: make 053 and 077 generic

[Eric Sandeen]

Christoph Hellwig wrote:
> On Thu, Jan 28, 2010 at 05:30:25PM -0600, Eric Sandeen wrote:
>> 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 <sandeen@sandeen.net>
>> ---
>>
>> diff --git a/053 b/053
>> index 98644a7..5542885 100755
>> --- a/053
>> +++ b/053
>> @@ -38,18 +38,19 @@ 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_requirements includes the chacl check, so it can be removed.

oh good point :)
 
> Btw, any reason _acl_requirements isn't called _require_acl?

It already existed, I just used it ... renaming is probably a good idea.

>> diff --git a/077 b/077
>> index cdee8da..d23305f 100755
>> --- a/077
>> +++ b/077
>> @@ -31,7 +31,8 @@ here=`pwd`
>>  tmp=/tmp/$$
>>  status=1
>>  #filler=$here/../../linux
>> -filler=/home/fsgqa/isms/2.4.x-xfs
>> +#filler=/home/fsgqa/isms/2.4.x-xfs
>> +filler=/lib/modules/`uname -r`/
> 
> Oooops.  Maybe just use /lib/modules/ to get as much as possible.
> And no need to let the other bits comment out there.  Maybe we need
> to generate the data instead to really be safe - at least for my
> tests under qemu I don't have any modules installed.  But that should
> be left for another patch.

hm, on the other hand some of my machines have so many kernels installed,
picking up all of /lib/modules might slow it down a lot.

So generating might be better, yeah.

> Anyway, patch looks good enough to go in for now, so

thanks, I'll pull the chacl test & the commented lines before that.

-Eric
 
> 
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: make 053 and 077 generic

[Christoph Hellwig]

On Sat, Jan 30, 2010 at 10:09:05AM -0600, Eric Sandeen wrote:
> > Btw, any reason _acl_requirements isn't called _require_acl?
> 
> It already existed, I just used it ... renaming is probably a good idea.

Yeah, just asking questions to myself while reading the patch..

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs