]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
tests: avoid false failure when df lists no root file system
authorPádraig Brady <P@draigBrady.com>
Mon, 25 Apr 2016 22:12:14 +0000 (23:12 +0100)
committerPádraig Brady <P@draigBrady.com>
Tue, 26 Apr 2016 10:35:59 +0000 (11:35 +0100)
* tests/df/skip-duplicates.sh: Skip the test when there is no
'/' entry listed by df, which was seen in certain chroot setups.

tests/df/skip-duplicates.sh

index 1b980b6537c6b76f7754598813ee5fa5ed89ad41..f3492637b5ff9bd051ce1167f0e6b06cb53a97b9 100755 (executable)
@@ -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)