From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 9 Nov 2012 09:11:18 +0000 (-0800)
Subject: df: port the new df test to POSIX sed, larger file systems
X-Git-Tag: v8.21~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a395b637a62a380f2d11e12f8c9e0eceb9e86a8f;p=thirdparty%2Fcoreutils.git

df: port the new df test to POSIX sed, larger file systems

* tests/df/df-output.sh: For the test "df -B1K --output=size",
do not assume that the file system size fits in 9 bytes; it
might be larger than that, so omit leading space.  Also, use
portable 'sed' commands: POSIX says sed commands inside { } should
all end in newline.
---

diff --git a/tests/df/df-output.sh b/tests/df/df-output.sh
index 0b40b2842a..f586334895 100644
--- a/tests/df/df-output.sh
+++ b/tests/df/df-output.sh
@@ -72,11 +72,17 @@ EOF
 
 df -h --o=source,fstype,size,used,avail,pcent \
  --o=itotal,iused,iavail,ipcent,target '.' >out || fail=1
-sed -e '1 {s/ [ ]*/ /g;q}' out > out2
+sed -e '1 {
+          s/ [ ]*/ /g
+          q
+        }' out > out2
 compare exp out2 || fail=1
 
 df -h --output '.' >out || fail=1
-sed -e '1 {s/ [ ]*/ /g;q}' out > out2
+sed -e '1 {
+          s/ [ ]*/ /g
+          q
+        }' out > out2
 compare exp out2 || fail=1
 
 # Ensure that --output indicates the block size
@@ -86,7 +92,11 @@ cat <<\EOF > exp || framework_failure_
 EOF
 
 df -B1K --output=size '.' >out || fail=1
-sed -e '1 {s/ [ ]*/ /g;q}' out > out2
+sed -e '1 {
+          s/ [ ]*/ /g
+          s/^ //
+          q
+        }' out > out2
 compare exp out2 || fail=1
 
 # Ensure that the grand total line now contains a "-" in the TARGET field ...
@@ -95,7 +105,11 @@ cat <<\EOF > exp || framework_failure_
 EOF
 
 df --output=source,target --total '.' >out || fail=1
-sed -n -e '3 {s/^total[ ]*//;p;q}' out > out2
+sed -n -e '3 {
+             s/^total[ ]*//
+             p
+             q
+           }' out > out2
 compare exp out2 || fail=1
 
 # ... but it should read "total" if there is no SOURCE field.
@@ -104,7 +118,10 @@ total
 EOF
 
 df --output=target --total '.' >out || fail=1
-sed -n -e '3 {p;q}' out > out2
+sed -n -e '3 {
+             p
+             q
+           }' out > out2
 compare exp out2 || fail=1
 
 # Ensure that --output is mentioned in the usage.