[PATCH, XFSQA] Don't run 175-177 if DMAPI is not supported

[PATCH, XFSQA] Don't run 175-177 if DMAPI is not supported

[David Chinner]

Don't run tests 175, 176 or 177 if dmapi is not supported by the
underlying kernel.

Signed-off-by: Dave Chinner <dgc@sgi.com>
---
 xfstests/175 |    5 +++++
 xfstests/176 |    5 +++++
 xfstests/177 |    5 +++++
 3 files changed, 15 insertions(+)

Index: xfs-cmds/xfstests/175
===================================================================
--- xfs-cmds.orig/xfstests/175	2007-08-24 14:19:48.000000000 +1000
+++ xfs-cmds/xfstests/175	2008-04-23 11:33:33.727631991 +1000
@@ -29,6 +29,7 @@ _cleanup()
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
+. ./common.dmapi
 . ./common.punch
 
 # real QA test starts here
@@ -37,6 +38,10 @@ _supported_os Linux
 
 _require_scratch
 
+# test that we have DMAPI support
+_dmapi_scratch_mount
+unmount $SCRATCH_MNT > /dev/null 2>&1
+
 # _test_punch args: blksize extsize_hint filesize "pp1 pp2 pp3" \
 # 					"ps1 ps2 ps3" "pt1 pt2 pt3" "wp1 wp2" "ws1 ws2" \
 #					"w p p w p" resvsp
Index: xfs-cmds/xfstests/176
===================================================================
--- xfs-cmds.orig/xfstests/176	2007-08-24 14:19:48.000000000 +1000
+++ xfs-cmds/xfstests/176	2008-04-23 11:33:57.780529656 +1000
@@ -27,6 +27,7 @@ _cleanup()
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
+. ./common.dmapi
 . ./common.punch
 
 # real QA test starts here
@@ -35,6 +36,10 @@ _supported_os Linux
 
 _require_scratch
 
+# test that we have DMAPI support
+_dmapi_scratch_mount
+unmount $SCRATCH_MNT > /dev/null 2>&1
+
 # _test_punch args: blksize extsize_hint filesize "pp1 pp2 pp3" \
 # 					"ps1 ps2 ps3" "pt1 pt2 pt3" "wp1 wp2" "ws1 ws2" \
 #					"w p p w p" resvsp
Index: xfs-cmds/xfstests/177
===================================================================
--- xfs-cmds.orig/xfstests/177	2007-10-12 13:50:14.000000000 +1000
+++ xfs-cmds/xfstests/177	2008-04-23 11:34:38.991214401 +1000
@@ -27,6 +27,7 @@ _cleanup()
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
+. ./common.dmapi
 
 # real QA test starts here
 
@@ -39,6 +40,10 @@ _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1 \
         || _fail "mkfs failed"
 
+# test that we have DMAPI support
+_dmapi_scratch_mount
+unmount $SCRATCH_MNT > /dev/null 2>&1
+
 _scratch_mount \
         || _fail "mount failed"
 

Re: [PATCH, XFSQA] Don't run 175-177 if DMAPI is not supported

[Timothy Shimmin]

Hi,

_test_punch already does a umount $SCRATCH_MNT.
However, IMHO, it would probably be nicer if one could
use a _require_dmapi or really it may be simpler if
we could roll it into common.dmapi
so one just needs to include common.dmapi and
it would complain at that point if the kernel
didn't support it.

--Tim

David Chinner wrote:
> Don't run tests 175, 176 or 177 if dmapi is not supported by the
> underlying kernel.
> 
> Signed-off-by: Dave Chinner <dgc@sgi.com>
> ---
>  xfstests/175 |    5 +++++
>  xfstests/176 |    5 +++++
>  xfstests/177 |    5 +++++
>  3 files changed, 15 insertions(+)
> 
> Index: xfs-cmds/xfstests/175
> ===================================================================
> --- xfs-cmds.orig/xfstests/175	2007-08-24 14:19:48.000000000 +1000
> +++ xfs-cmds/xfstests/175	2008-04-23 11:33:33.727631991 +1000
> @@ -29,6 +29,7 @@ _cleanup()
>  # get standard environment, filters and checks
>  . ./common.rc
>  . ./common.filter
> +. ./common.dmapi
>  . ./common.punch
>  
>  # real QA test starts here
> @@ -37,6 +38,10 @@ _supported_os Linux
>  
>  _require_scratch
>  
> +# test that we have DMAPI support
> +_dmapi_scratch_mount
> +unmount $SCRATCH_MNT > /dev/null 2>&1
> +
>  # _test_punch args: blksize extsize_hint filesize "pp1 pp2 pp3" \
>  # 					"ps1 ps2 ps3" "pt1 pt2 pt3" "wp1 wp2" "ws1 ws2" \
>  #					"w p p w p" resvsp
> Index: xfs-cmds/xfstests/176
> ===================================================================
> --- xfs-cmds.orig/xfstests/176	2007-08-24 14:19:48.000000000 +1000
> +++ xfs-cmds/xfstests/176	2008-04-23 11:33:57.780529656 +1000
> @@ -27,6 +27,7 @@ _cleanup()
>  # get standard environment, filters and checks
>  . ./common.rc
>  . ./common.filter
> +. ./common.dmapi
>  . ./common.punch
>  
>  # real QA test starts here
> @@ -35,6 +36,10 @@ _supported_os Linux
>  
>  _require_scratch
>  
> +# test that we have DMAPI support
> +_dmapi_scratch_mount
> +unmount $SCRATCH_MNT > /dev/null 2>&1
> +
>  # _test_punch args: blksize extsize_hint filesize "pp1 pp2 pp3" \
>  # 					"ps1 ps2 ps3" "pt1 pt2 pt3" "wp1 wp2" "ws1 ws2" \
>  #					"w p p w p" resvsp
> Index: xfs-cmds/xfstests/177
> ===================================================================
> --- xfs-cmds.orig/xfstests/177	2007-10-12 13:50:14.000000000 +1000
> +++ xfs-cmds/xfstests/177	2008-04-23 11:34:38.991214401 +1000
> @@ -27,6 +27,7 @@ _cleanup()
>  # get standard environment, filters and checks
>  . ./common.rc
>  . ./common.filter
> +. ./common.dmapi
>  
>  # real QA test starts here
>  
> @@ -39,6 +40,10 @@ _require_scratch
>  _scratch_mkfs_xfs >/dev/null 2>&1 \
>          || _fail "mkfs failed"
>  
> +# test that we have DMAPI support
> +_dmapi_scratch_mount
> +unmount $SCRATCH_MNT > /dev/null 2>&1
> +
>  _scratch_mount \
>          || _fail "mount failed"
>  

Re: [PATCH, XFSQA] Don't run 175-177 if DMAPI is not supported

[David Chinner]

On Wed, Apr 23, 2008 at 04:58:12PM +1000, Timothy Shimmin wrote:
> Hi,
> 
> _test_punch already does a umount $SCRATCH_MNT.
> However, IMHO, it would probably be nicer if one could
> use a _require_dmapi or really it may be simpler if
> we could roll it into common.dmapi
> so one just needs to include common.dmapi and
> it would complain at that point if the kernel
> didn't support it.

Sure, but we don't have that, and I'm not about to spend the time to
convert >20 tests to something like this. Right now I just want to
remove all the bloody silly test failures on mainline kernels.

All the other dmapi tests "not run" just fine, I want these to do
the same thing. Is that good enough to check in right now?

Cheers,

Dave.
-- 
Dave Chinner
Principal Engineer
SGI Australian Software Group

Re: [PATCH, XFSQA] Don't run 175-177 if DMAPI is not supported

[Timothy Shimmin]

David Chinner wrote:
> On Wed, Apr 23, 2008 at 04:58:12PM +1000, Timothy Shimmin wrote:
>> Hi,
>>
>> _test_punch already does a umount $SCRATCH_MNT.
>> However, IMHO, it would probably be nicer if one could
>> use a _require_dmapi or really it may be simpler if
>> we could roll it into common.dmapi
>> so one just needs to include common.dmapi and
>> it would complain at that point if the kernel
>> didn't support it.
> 
> Sure, but we don't have that, and I'm not about to spend the time to
> convert >20 tests to something like this. Right now I just want to
> remove all the bloody silly test failures on mainline kernels.
> 
> All the other dmapi tests "not run" just fine, I want these to do
> the same thing. Is that good enough to check in right now?
> 
> Cheers,
> 
> Dave.

Sure, that's fine.

I was really just suggesting to put:

+# test that we have DMAPI support
+_dmapi_scratch_mount
+unmount $SCRATCH_MNT > /dev/null 2>&1

directly into common.dmapi - not as a function
but just as code to always execute.
As long as there is no output under normal circumstances from
this, then all dmapi tests should not require any change
and it is simpler (all they need is to include common.dmapi
which most do).
There may be an extra mount in some of the
tests (for those that want to keep it mounted) but who cares.
Why include common.dmapi if you don't require it to be supported :)

--Tim

Re: [PATCH, XFSQA] Don't run 175-177 if DMAPI is not supported

[David Chinner]

On Mon, Apr 28, 2008 at 10:09:44AM +1000, Timothy Shimmin wrote:
> David Chinner wrote:
> >On Wed, Apr 23, 2008 at 04:58:12PM +1000, Timothy Shimmin wrote:
> >>Hi,
> >>
> >>_test_punch already does a umount $SCRATCH_MNT.
> >>However, IMHO, it would probably be nicer if one could
> >>use a _require_dmapi or really it may be simpler if
> >>we could roll it into common.dmapi
> >>so one just needs to include common.dmapi and
> >>it would complain at that point if the kernel
> >>didn't support it.
> >
> >Sure, but we don't have that, and I'm not about to spend the time to
> >convert >20 tests to something like this. Right now I just want to
> >remove all the bloody silly test failures on mainline kernels.
> >
> >All the other dmapi tests "not run" just fine, I want these to do
> >the same thing. Is that good enough to check in right now?
> >
> >Cheers,
> >
> >Dave.
> 
> Sure, that's fine.
> 
> I was really just suggesting to put:
> 
> +# test that we have DMAPI support
> +_dmapi_scratch_mount
> +unmount $SCRATCH_MNT > /dev/null 2>&1
> 
> directly into common.dmapi - not as a function
> but just as code to always execute.

Ok, so i tried this and all the dmapi tests then gave "not run"
status even though dmapi was build into the kernel.

Don't know why, don't really have time to find out right now.

Cheers,

Dave.
-- 
Dave Chinner
Principal Engineer
SGI Australian Software Group