Skip to contentSkip to conversation

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

PATCH In review Ari Sundholm 2 participants 2 messages Jun 8, 2015 – Jun 17, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common/punch, generic/273: Minor things for busybox support.

From: Ari Sundholm <[email protected]>

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

---
 common/punch      | 4 ++--
 tests/generic/273 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
common/punch +2 -2
index a75f4cf..7f268cd 100644
@@ -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;
tests/generic/273 +1 -1
index 1ceb6c4..f15fcf2 100755
@@ -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
Signature · 1 line
1.9.1
#1 lore raw
Quoted 15 lines · Ari Sundholm

From: Ari Sundholm <[email protected]>

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

---
 common/punch      | 4 ++--
 tests/generic/273 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
common/punch +0 -0
index a75f4cf..7f268cd 100644

common/punch _coalesce_extents() · line 206

Quoted 5 lines
common/punch +1 -1
@@ -203,7 +203,7 @@ _coalesce_extents()
 
 _filter_fiemap()
 {
-	awk --posix '
+	awk '

Should be using $AWK_PROG.

Cheers,

Dave.

Signature · 2 lines
Dave Chinner
[email protected]