[PATCH] generic/25[02]: increase filesystem size

[PATCH] generic/25[02]: increase filesystem size

[Dave Chinner]

From: Dave Chinner <dchinner@redhat.com>

On reflink+rmapbt XFs filesystems there isn't enough free space to
run this test on the 64MB filesystem image created. It notruns with
a curious error message - needs at least 0GB free:

generic/250             [10:01:57] [10:01:58] [not run]
        generic/250 -- This test requires at least 0GB free on /mnt/scratch to run

Fix this by increasing the size of the base filesystem image.

Signed-Off-By: Dave Chinner <dchinner@redhat.com>
---
 tests/generic/250 | 6 +++---
 tests/generic/252 | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/generic/250 b/tests/generic/250
index a8fd97e31ff0..6b0f7e3126af 100755
--- a/tests/generic/250
+++ b/tests/generic/250
@@ -54,10 +54,10 @@ _require_no_rtinherit
 
 rm -f $seqres.full
 
-
+fssize=$((100 * 1048576))
 echo "Format and mount"
-$XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $((64 * 1048576))" $SCRATCH_DEV >> $seqres.full
-_scratch_mkfs_sized $((64 * 1048576)) > $seqres.full 2>&1
+$XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
+_scratch_mkfs_sized $fssize > $seqres.full 2>&1
 _dmerror_init
 _dmerror_mount >> $seqres.full 2>&1
 _dmerror_unmount
diff --git a/tests/generic/252 b/tests/generic/252
index b506d599f638..e102945d83b7 100755
--- a/tests/generic/252
+++ b/tests/generic/252
@@ -56,9 +56,10 @@ AIO_TEST="src/aio-dio-regress/aiocp"
 rm -f $seqres.full
 
 
+fssize=$((100 * 1048576))
 echo "Format and mount"
-$XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $((64 * 1048576))" $SCRATCH_DEV >> $seqres.full
-_scratch_mkfs_sized $((64 * 1048576)) > $seqres.full 2>&1
+$XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
+_scratch_mkfs_sized $fssize > $seqres.full 2>&1
 _dmerror_init
 _dmerror_mount >> $seqres.full 2>&1
 _dmerror_unmount
-- 
2.16.1

Re: [PATCH] generic/25[02]: increase filesystem size

[Darrick J. Wong]

On Thu, Feb 22, 2018 at 11:32:03AM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> On reflink+rmapbt XFs filesystems there isn't enough free space to
> run this test on the 64MB filesystem image created. It notruns with
> a curious error message - needs at least 0GB free:
> 
> generic/250             [10:01:57] [10:01:58] [not run]
>         generic/250 -- This test requires at least 0GB free on /mnt/scratch to run

TBH I think someone ought to fix that to spit out MB if < 1024M, but
that's a different patch.

Worksforme,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> 
> Fix this by increasing the size of the base filesystem image.
> 
> Signed-Off-By: Dave Chinner <dchinner@redhat.com>
> ---
>  tests/generic/250 | 6 +++---
>  tests/generic/252 | 5 +++--
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/generic/250 b/tests/generic/250
> index a8fd97e31ff0..6b0f7e3126af 100755
> --- a/tests/generic/250
> +++ b/tests/generic/250
> @@ -54,10 +54,10 @@ _require_no_rtinherit
>  
>  rm -f $seqres.full
>  
> -
> +fssize=$((100 * 1048576))
>  echo "Format and mount"
> -$XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $((64 * 1048576))" $SCRATCH_DEV >> $seqres.full
> -_scratch_mkfs_sized $((64 * 1048576)) > $seqres.full 2>&1
> +$XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
> +_scratch_mkfs_sized $fssize > $seqres.full 2>&1
>  _dmerror_init
>  _dmerror_mount >> $seqres.full 2>&1
>  _dmerror_unmount
> diff --git a/tests/generic/252 b/tests/generic/252
> index b506d599f638..e102945d83b7 100755
> --- a/tests/generic/252
> +++ b/tests/generic/252
> @@ -56,9 +56,10 @@ AIO_TEST="src/aio-dio-regress/aiocp"
>  rm -f $seqres.full
>  
>  
> +fssize=$((100 * 1048576))
>  echo "Format and mount"
> -$XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $((64 * 1048576))" $SCRATCH_DEV >> $seqres.full
> -_scratch_mkfs_sized $((64 * 1048576)) > $seqres.full 2>&1
> +$XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
> +_scratch_mkfs_sized $fssize > $seqres.full 2>&1
>  _dmerror_init
>  _dmerror_mount >> $seqres.full 2>&1
>  _dmerror_unmount
> -- 
> 2.16.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html