common/punch, generic/273: Minor things for busybox support.
diff mbox

Message ID 1433788464.28321.9.camel@ari-macbook
State New
Headers show

Commit Message

Ari Sundholm June 8, 2015, 6:34 p.m. UTC
From: Ari Sundholm <ari@tuxera.com>

These changes make it possible to run more of the tests on busybox.

Signed-off-by: Ari Sundholm <ari@tuxera.com>
---
 common/punch      | 4 ++--
 tests/generic/273 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Dave Chinner June 17, 2015, 9:49 p.m. UTC | #1
On Mon, Jun 08, 2015 at 09:34:24PM +0300, Ari Sundholm wrote:
> From: Ari Sundholm <ari@tuxera.com>
> 
> These changes make it possible to run more of the tests on busybox.
> 
> Signed-off-by: Ari Sundholm <ari@tuxera.com>
> ---
>  common/punch      | 4 ++--
>  tests/generic/273 | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/common/punch b/common/punch
> index a75f4cf..7f268cd 100644
> --- a/common/punch
> +++ b/common/punch
> @@ -203,7 +203,7 @@ _coalesce_extents()
>  
>  _filter_fiemap()
>  {
> -	awk --posix '
> +	awk '

Should be using $AWK_PROG.

Cheers,

Dave.

Patch
diff mbox

diff --git a/common/punch b/common/punch
index a75f4cf..7f268cd 100644
--- a/common/punch
+++ b/common/punch
@@ -203,7 +203,7 @@  _coalesce_extents()
 
 _filter_fiemap()
 {
-	awk --posix '
+	awk '
 		$3 ~ /hole/ {
 			print $1, $2, $3;
 			next;
@@ -223,7 +223,7 @@  _filter_fiemap()
 # it is an extent or a hole
 _filter_hole_fiemap()
 {
-	awk --posix '
+	awk '
 		$3 ~ /hole/ {
 			print $1, $2, $3; 
 			next;
diff --git a/tests/generic/273 b/tests/generic/273
index 1ceb6c4..f15fcf2 100755
--- a/tests/generic/273
+++ b/tests/generic/273
@@ -68,7 +68,7 @@  _file_create()
 
 	cd $SCRATCH_MNT/origin
 
-	_disksize=`$DF_PROG --block-size=1 $SCRATCH_DEV | tail -1 | awk '{ print $5 }'`
+	_disksize=`$DF_PROG -B 1 $SCRATCH_DEV | tail -1 | awk '{ print $5 }'`
 	_disksize=$(($_disksize / 3))
 	_num=$(($_disksize / $count / $threads / 4096))
 	_count=$count