xfstests: make 053 and 077 generic

PATCH In review Eric Sandeen 2 participants 4 messages Jan 28, 2010 – Jan 30, 2010

lore

Share & tools

lore

Eric Sandeen

author

2010-01-28 23:29 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

053 +4 -3

index 98644a7..5542885 100755
@@ -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

077 +7 -3

index cdee8da..d23305f 100755
@@ -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"

group +1 -1

index 6b8528f..c66d965 100644
@@ -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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Christoph Hellwig

Reviewed-by on v1 1/1

2010-01-30 10:25 UTC #1 lore raw

Quoted 15 lines · 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 <[email protected]>
---
053 +0 -0
index 98644a7..5542885 100755
@@ -38,18 +38,19 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.attr

053 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 · line 47

Quoted 10 lines

053 +2 -1

 
 # 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?

077 here=`pwd` · line 35

Quoted 11 lines

077 +2 -1

index cdee8da..d23305f 100755
@@ -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 <[email protected]>

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Eric Sandeen

author

2010-01-30 16:07 UTC #2 lore raw

Quoted 22 lines · Christoph Hellwig

Quoted 21 lines · 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 <[email protected]>
---
053 +1 -1
index 98644a7..5542885 100755
@@ -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
 

Quoted 6 lines

053 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 · line 47
Quoted 4 lines
053 +1 -0
 [ ! -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 :)

Quoted 1 line

Btw, any reason _acl_requirements isn't called _require_acl?

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

Quoted 9 lines

077 +0 -1

index cdee8da..d23305f 100755
@@ -31,7 +31,8 @@ here=`pwd`
 tmp=/tmp/$$
 status=1
 #filler=$here/../../linux
-filler=/home/fsgqa/isms/2.4.x-xfs

Quoted 8 lines

077 here=`pwd` · line 35
Quoted 2 lines
077 +2 -0
+#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.

Quoted 1 line

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

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

-Eric

Quoted 3 lines

Reviewed-by Christoph Hellwig <[email protected]>

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Christoph Hellwig

2010-01-30 19:07 UTC #3 lore raw

Quoted 3 lines · Eric Sandeen

Quoted 1 line
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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs