From: Pádraig Brady <P@draigBrady.com>
Date: Mon, 20 Sep 2010 14:07:02 +0000 (+0100)
Subject: tests: fix an erroneous stat failure with bind mounts
X-Git-Tag: v8.6~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=v8.5-159-gf57cb37;p=thirdparty%2Fcoreutils.git

tests: fix an erroneous stat failure with bind mounts

* tests/misc/stat-mount: Don't try to correlate the
mount points output by df and stat, as they're similar,
but sometimes different in the presence of bind mounts.
* doc/coretuils.texi (stat invocation): Clarify the
bind mount difference between stat and df.
---

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 72ee450d3b..170ce0c378 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -10715,9 +10715,10 @@ stat does not search for specified device nodes in the
 file system list, instead operating on them directly
 @item
 @cindex bind mount
-stat outputs the alias for a bind mounted file,
-rather than its backing device.  One can recursively call stat
-until there is no change in output, to get the base mount point
+stat outputs the alias for a bind mounted file, rather than
+the initial mount point of its backing device.
+One can recursively call stat until there is no change in output,
+to get the current base mount point
 @end itemize
 
 When listing file system information (@option{--file-system} (@option{-f})),
diff --git a/tests/misc/stat-mount b/tests/misc/stat-mount
index c1c43d49cf..a99291f6de 100755
--- a/tests/misc/stat-mount
+++ b/tests/misc/stat-mount
@@ -18,14 +18,8 @@
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
-# Note we assume that the current directory is not bind mounted
-# (as then, stat and df may have different results).
-# This should be the case given the directory is temporary
-# for the duration of the test.
-
 df_mnt=$(df -P . | sed -n '2s/.* \([^ ]*$\)/\1/p')
-stat_mnt=$(stat -c%m .)
-
-test "$df_mnt" = "$stat_mnt" || fail=1
+stat_mnt=$(stat -c%m .) || fail=1
+test "$stat_mnt" || fail=1
 
 Exit $fail