awk invocation cleanup for busybox support.

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

Signed-off-by: Ari Sundholm <ari@tuxera.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/punch b/common/punch
index a75f4cfde43d9e6afdb8b5a877132959289fd021..e8770ab834a7c80f5b0c4e8a58d0674edad765d4 100644 (file)
--- a/common/punch
+++ b/common/punch
@@ -203,7 +203,7 @@ _coalesce_extents()
 
 _filter_fiemap()
 {
-       awk --posix '
+       $AWK_PROG '
                $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_PROG '
                $3 ~ /hole/ {
                        print $1, $2, $3; 
                        next;

diff --git a/tests/generic/273 b/tests/generic/273
index 1ceb6c4af646cf692839ddb045080b2d7fe84e5e..e5af7f14eea4a4f57a55581408e3809348ff5dcb 100755 (executable)
--- 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_PROG '{ print $5 }'`
        _disksize=$(($_disksize / 3))
        _num=$(($_disksize / $count / $threads / 4096))
        _count=$count