From: Pádraig Brady <P@draigBrady.com>
Date: Sat, 16 Jan 2016 13:34:07 +0000 (+0000)
Subject: tests: avoid false failure with BTRFS subvolumes
X-Git-Tag: v8.25~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a5494271c3ffa371cdc8773cd12682f3d5c678f;p=thirdparty%2Fcoreutils.git

tests: avoid false failure with BTRFS subvolumes

* tests/df/df-symlink.sh: Only check the symmetry of
the source <-> target lookup, when the source is only mounted once,
which isn't the case if '.' is a BTRFS subvolume for example.
Reported by Assaf Gordon on a default OpenSUSE 42.1 install.
---

diff --git a/tests/df/df-symlink.sh b/tests/df/df-symlink.sh
index ed4c7882c3..a9d8c96239 100755
--- a/tests/df/df-symlink.sh
+++ b/tests/df/df-symlink.sh
@@ -32,7 +32,11 @@ compare exp out || fail=1
 # This was not the case in coreutil-8.22 on systems
 # where the device in the mount list was a symlink itself.
 # I.e., '.' => /dev/mapper/fedora-home -> /dev/dm-2
-df --out=source,target '.' > out || fail=1
-compare exp out || fail=1
+# Restrict this test to systems with a 1:1 mapping between
+# source and target.  This excludes for example BTRFS sub-volumes.
+if test "$(df --output=source | grep -F "$disk" | wc -l)" = 1; then
+  df --out=source,target '.' > out || fail=1
+  compare exp out || fail=1
+fi
 
 Exit $fail