From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 11 Dec 2013 04:42:59 +0000 (+0000)
Subject: tests: avoid warnings due to new filefrag -v format
X-Git-Tag: v8.22~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b95aac31803e64c766f4f0a097938366c7e3cee1;p=thirdparty%2Fcoreutils.git

tests: avoid warnings due to new filefrag -v format

* tests/cp/sparse-fiemap.sh: Newer versions of filefrag output
more fields, in different orders, so handle that to avoid warnings.
---

diff --git a/tests/cp/sparse-fiemap.sh b/tests/cp/sparse-fiemap.sh
index 47ddf29433..59b7db38d4 100755
--- a/tests/cp/sparse-fiemap.sh
+++ b/tests/cp/sparse-fiemap.sh
@@ -64,7 +64,8 @@ fi
 f()
 {
   sed 's/ [a-z,][a-z,]*$//' $@ \
-    | $AWK '/^ *[0-9]/ {printf "%d %d ", $2, (NF<5 ? $NF : $5) } END {print ""}'
+    | $AWK '/^ *[0-9]/ {printf "%d %d ", $2, (NF>=6 ? $6 : (NF<5 ? $NF : $5)) }
+            END {print ""}'
 }
 
 for i in $(seq 1 2 21); do