From: Jim Meyering <jim@meyering.net>
Date: Wed, 16 Aug 2006 09:44:55 +0000 (+0000)
Subject: * tests/ls/stat-dtype: Use stat to test file system type, rather
X-Git-Tag: v6.1~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=481113d5513b06bc5bcf7d75c38455e172deb719;p=thirdparty%2Fcoreutils.git

* tests/ls/stat-dtype: Use stat to test file system type, rather
than df -T, in case /etc/mtab lies.  Reported by Michael Stone.
---

diff --git a/ChangeLog b/ChangeLog
index ee704fe3ce..f837918bf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-16  Jim Meyering  <jim@meyering.net>
+
+	* tests/ls/stat-dtype: Use stat to test file system type, rather
+	than df -T, in case /etc/mtab lies.  Reported by Michael Stone.
+
 2006-08-15  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* NEWS: Mention that df exits with nonzero status if it generates
diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype
index 5148d5acda..f6a50fda8f 100755
--- a/tests/ls/stat-dtype
+++ b/tests/ls/stat-dtype
@@ -16,8 +16,9 @@ fi
 # linux-2.6.15, at least tmpfs and ext3 work, but reiserfs and xfs don't.
 # Also, tmpfs on Solaris 10 lacks d_type support.
 skip=yes
-test `uname -s` = Linux && df -t tmpfs . > /dev/null 2>&1 && skip=no
-df -t ext3 . > /dev/null 2>&1 && skip=no
+fs_type=`stat -f --printf %T .`
+test `uname -s` = Linux && test $fs_type = tmpfs && skip=no
+test $fs_type = ext2/ext3 && skip=no
 test $skip = yes &&
   {
     echo "$0: '.' is not on a suitable file system for this test" 1>&2