* [PATCH 1/3] xfstests: routine to create scratch of certain size
2010-02-03 21:35 [PATCH 0/3] resending a few xfstests patches as a series Eric Sandeen
@ 2010-02-03 21:37 ` Eric Sandeen
2010-02-05 9:37 ` Christoph Hellwig
2010-02-03 21:38 ` [PATCH 2/3] xfstests: make 053 and 077 generic Eric Sandeen
2010-02-03 21:41 ` [PATCH 3/3] xfstests: rename _acl_requirements to _require_acls Eric Sandeen
2 siblings, 1 reply; 7+ messages in thread
From: Eric Sandeen @ 2010-02-03 21:37 UTC (permalink / raw)
To: xfs mailing list
This is needed for later enospc tests to be generic
We have to explicitly call the mkfs rather than
_scratch_mkfs since extN wants nr-of-blocks as
an argument -after- the device name.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
diff --git a/common.rc b/common.rc
index 1edea2f..0a02a2b 100644
--- a/common.rc
+++ b/common.rc
@@ -305,6 +305,29 @@ _scratch_mkfs()
esac
}
+# Create fs of certain size on scratch device
+# _scratch_mkfs_sized <size in bytes> [optional blocksize]
+_scratch_mkfs_sized()
+{
+ fssize=$1
+ blocksize=$2
+ [ -z "$blocksize" ] && blocksize=4096
+ let blocks=$fssize/$blocksize
+
+ case $FSTYP in
+ xfs)
+ _scratch_mkfs_xfs -d size=$fssize -b size=$blocksize
+ ;;
+ ext2|ext3|ext4)
+ /sbin/mkfs.$FSTYP -b $blocksize $SCRATCH_DEV $blocks
+ ;;
+ *)
+ _notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
+ ;;
+ esac
+ _scratch_mkfs
+}
+
# Emulate an N-data-disk stripe w/ various stripe units
# _scratch_mkfs_geom <sunit bytes> <swidth multiplier> [optional blocksize]
_scratch_mkfs_geom()
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/3] xfstests: make 053 and 077 generic
2010-02-03 21:35 [PATCH 0/3] resending a few xfstests patches as a series Eric Sandeen
2010-02-03 21:37 ` [PATCH 1/3] xfstests: routine to create scratch of certain size Eric Sandeen
@ 2010-02-03 21:38 ` Eric Sandeen
2010-02-05 9:37 ` Christoph Hellwig
2010-02-03 21:41 ` [PATCH 3/3] xfstests: rename _acl_requirements to _require_acls Eric Sandeen
2 siblings, 1 reply; 7+ messages in thread
From: Eric Sandeen @ 2010-02-03 21:38 UTC (permalink / raw)
To: xfs mailing list
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..439cbe6 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 cdee8da..a3d9334 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 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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/3] xfstests: rename _acl_requirements to _require_acls
2010-02-03 21:35 [PATCH 0/3] resending a few xfstests patches as a series Eric Sandeen
2010-02-03 21:37 ` [PATCH 1/3] xfstests: routine to create scratch of certain size Eric Sandeen
2010-02-03 21:38 ` [PATCH 2/3] xfstests: make 053 and 077 generic Eric Sandeen
@ 2010-02-03 21:41 ` Eric Sandeen
2010-02-05 9:38 ` Christoph Hellwig
2 siblings, 1 reply; 7+ messages in thread
From: Eric Sandeen @ 2010-02-03 21:41 UTC (permalink / raw)
To: xfs mailing list
Most requirement tests are named _require_foo, so just
make this more consistent.
Also remove a few redundant tests for /usr/bin/chacl
since _require_acls covers that.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
diff --git a/051 b/051
index 238abe9..12febd3 100755
--- a/051
+++ b/051
@@ -73,7 +73,6 @@ _cleanup()
_supported_fs xfs udf
_supported_os Linux
-[ -x /usr/bin/chacl ] || _notrun "chacl executable not found"
[ -x $runas ] || _notrun "$runas executable not found"
rm -f $seq.full
@@ -82,7 +81,7 @@ _setup_testdir
_need_to_be_root
_acl_setup_ids
-_acl_requirements
+_require_acls
# get dir
cd $testdir
diff --git a/053 b/053
index 439cbe6..ac2162d 100755
--- a/053
+++ b/053
@@ -42,7 +42,7 @@ _supported_fs generic
_supported_os Linux
_require_scratch
-_acl_requirements
+_require_acls
_acl_setup_ids
_do_die_on_error=y
test=$SCRATCH_MNT/test
diff --git a/067 b/067
index 5ab743e..f1c211f 100755
--- a/067
+++ b/067
@@ -41,10 +41,8 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os Linux
-[ -x /usr/bin/chacl ] || _notrun "chacl executable not found"
-
_need_to_be_root
-_acl_requirements
+_require_acls
_require_scratch
# set up fs for 1K inodes
diff --git a/077 b/077
index a3d9334..ea81c07 100755
--- a/077
+++ b/077
@@ -53,7 +53,7 @@ _supported_os Linux
[ ! -d $filler ] && _notrun "No directory to source files from"
_require_scratch
-_acl_requirements
+_require_acls
echo "*** create filesystem"
diff --git a/099 b/099
index 90af18f..b68bfcd 100755
--- a/099
+++ b/099
@@ -81,7 +81,8 @@ _supported_fs generic
_supported_os IRIX
_acl_setup_ids
-_acl_requirements
+_require_acls
+
[ -x $runas ] || _notrun "$runas executable not found"
# get dir
diff --git a/105 b/105
index 9544c66..aba1f6d 100755
--- a/105
+++ b/105
@@ -56,7 +56,7 @@ rm -f $seq.full
_require_scratch
_acl_setup_ids
-_acl_requirements
+_require_acls
umount $SCRATCH_DEV >/dev/null 2>&1
echo "*** MKFS ***" >>$seq.full
diff --git a/common.attr b/common.attr
index d12cc02..5019884 100644
--- a/common.attr
+++ b/common.attr
@@ -112,7 +112,7 @@ _filter_aces_notypes()
# test if acl code will work
#
-_acl_requirements()
+_require_acls()
{
xfsdir=$TEST_DIR
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 7+ messages in thread