From: Pádraig Brady <P@draigBrady.com>
Date: Mon, 25 Apr 2016 22:12:14 +0000 (+0100)
Subject: tests: avoid false failure when df lists no root file system
X-Git-Tag: v8.26~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9146c4a2b947998b11c0995d017ca64a5583a1;p=thirdparty%2Fcoreutils.git

tests: avoid false failure when df lists no root file system

* tests/df/skip-duplicates.sh: Skip the test when there is no
'/' entry listed by df, which was seen in certain chroot setups.
---

diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh
index 1b980b6537..f3492637b5 100755
--- a/tests/df/skip-duplicates.sh
+++ b/tests/df/skip-duplicates.sh
@@ -23,11 +23,12 @@ require_gcc_shared_
 
 # We use --local here so as to not activate
 # potentially very many remote mounts.
-df --local || skip_ 'df fails'
+df --local --output=target >LOCAL_FS || skip_ 'df fails'
+grep '^/$' LOCAL_FS || skip_ 'no root file system found'
 
-export CU_NONROOT_FS=$(df --local --output=target 2>&1 | grep /. | head -n1)
-export CU_REMOTE_FS=$(df --local --output=target 2>&1 | grep /. |
-                      tail -n+2 | head -n1)
+# Get real targets to substitute for /NONROOT and /REMOTE below.
+export CU_NONROOT_FS=$(grep /. LOCAL_FS | head -n1)
+export CU_REMOTE_FS=$(grep /. LOCAL_FS | tail -n+2 | head -n1)
 
 unique_entries=1
 test -z "$CU_NONROOT_FS" || unique_entries=$(expr $unique_entries + 1)