[PATCH 1/2] Fix test 298 to work for non-XFS filesystems

[PATCH 1/2] Fix test 298 to work for non-XFS filesystems

[Jan Kara]

Call to xfs_io in test 298 forgot to specify -F flag so it failed for
non-XFS filesystems.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 tests/shared/298 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/shared/298 b/tests/shared/298
index f1a3432..d5bed1c 100644
--- a/tests/shared/298
+++ b/tests/shared/298
@@ -49,7 +49,7 @@ _cleanup()
 
 get_holes()
 {
-	$XFS_IO_PROG -c fiemap $1 | grep hole | $SED_PROG 's/.*\[\(.*\)\.\.\(.*\)\].*/\1 \2/'
+	$XFS_IO_PROG -F -c fiemap $1 | grep hole | $SED_PROG 's/.*\[\(.*\)\.\.\(.*\)\].*/\1 \2/'
 }
 
 get_free_sectors()
-- 
1.8.1.4

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

[PATCH 2/2] Make test 306 use null and zero device nodes on SCRATCH_MNT

[Jan Kara]

In one place of test 306, we mistakenly used /dev/null and /dev/zero
instead of equivalent devices created on tested filesystem. So we were
not really testing the functionality we intended.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 tests/generic/306 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/generic/306 b/tests/generic/306
index e8e0fc0..f45d142 100644
--- a/tests/generic/306
+++ b/tests/generic/306
@@ -73,9 +73,9 @@ _scratch_mount -o ro || _fail "Could not mount scratch readonly"
 echo "== try to create new file"
 touch $SCRATCH_MNT/this_should_fail 2>&1 | _filter_scratch
 echo "== pwrite to null device"
-$XFS_IO_PROG -F -c "pwrite 0 512" /dev/null | _filter_xfs_io
+$XFS_IO_PROG -F -c "pwrite 0 512" $DEVNULL | _filter_xfs_io
 echo "== pread from zero device"
-$XFS_IO_PROG -F -c "pread 0 512" /dev/zero | _filter_xfs_io
+$XFS_IO_PROG -F -c "pread 0 512" $DEVZERO | _filter_xfs_io
 
 echo "== truncating write to null device"
 echo foo > $DEVNULL 2>&1 | _filter_scratch
-- 
1.8.1.4

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

Re: [PATCH 1/2] Fix test 298 to work for non-XFS filesystems

[Dave Chinner]

On Wed, May 08, 2013 at 12:09:32AM +0200, Jan Kara wrote:
> Call to xfs_io in test 298 forgot to specify -F flag so it failed for
> non-XFS filesystems.
> 
> Signed-off-by: Jan Kara <jack@suse.cz>

See Eric's recent patch series to fix this.

http://oss.sgi.com/pipermail/xfs/2013-May/026057.html

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

Re: [PATCH 2/2] Make test 306 use null and zero device nodes on SCRATCH_MNT

[Eric Sandeen]

On 5/7/13 5:09 PM, Jan Kara wrote:
> In one place of test 306, we mistakenly used /dev/null and /dev/zero
> instead of equivalent devices created on tested filesystem. So we were
> not really testing the functionality we intended.
> 
> Signed-off-by: Jan Kara <jack@suse.cz>

Ugh.  A fine mistake on my part.  Thanks for catching that, cripes!

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  tests/generic/306 | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/generic/306 b/tests/generic/306
> index e8e0fc0..f45d142 100644
> --- a/tests/generic/306
> +++ b/tests/generic/306
> @@ -73,9 +73,9 @@ _scratch_mount -o ro || _fail "Could not mount scratch readonly"
>  echo "== try to create new file"
>  touch $SCRATCH_MNT/this_should_fail 2>&1 | _filter_scratch
>  echo "== pwrite to null device"
> -$XFS_IO_PROG -F -c "pwrite 0 512" /dev/null | _filter_xfs_io
> +$XFS_IO_PROG -F -c "pwrite 0 512" $DEVNULL | _filter_xfs_io
>  echo "== pread from zero device"
> -$XFS_IO_PROG -F -c "pread 0 512" /dev/zero | _filter_xfs_io
> +$XFS_IO_PROG -F -c "pread 0 512" $DEVZERO | _filter_xfs_io
>  
>  echo "== truncating write to null device"
>  echo foo > $DEVNULL 2>&1 | _filter_scratch
> 

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

Re: [PATCH 2/2] Make test 306 use null and zero device nodes on SCRATCH_MNT

[Rich Johnston]

This patch has been committed:

commit 2941898570ccdb32ab5af89c0b25147231489973
Author: Jan Kara <jack@suse.cz>
Date:   Tue May 14 07:02:50 2013 -0500

     Make test 306 use null and zero device nodes on SCRATCH_MNT

Thanks
--Rich

On 05/07/2013 05:09 PM, Jan Kara wrote:
> In one place of test 306, we mistakenly used /dev/null and /dev/zero
> instead of equivalent devices created on tested filesystem. So we were
> not really testing the functionality we intended.
>

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