* tests/ls/stat-dtype: If "." is tmpfs, skip this test unless uname -s

reports "Linux".  This avoids a failure on Solaris 10's tmpfs.
Redirect both stdout and stderr of df invocations.

diff --git a/ChangeLog b/ChangeLog
index 79792fa045e9a825a6505455bb40c85571a2eced..a95ee39f280d05129ccc938266cee5be37c35028 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-10  Jim Meyering  <jim@meyering.net>
 
+       * tests/ls/stat-dtype: If "." is tmpfs, skip this test unless uname -s
+       reports "Linux".  This avoids a failure on Solaris 10's tmpfs.
+       Redirect both stdout and stderr of df invocations.
+
        * src/dircolors.hin: Add a TERM directive for each of the following:
        ansi, color-xterm, gnome, konsole, kterm, rxvt-cygwin,
        rxvt-cygwin-native, screen.linux, xterm-256color.

diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype
index e94c2eb3183fff303ef78a31d8a528b4cd36582a..5148d5acda6676d77f79c00020d9b9ba8bb6ec21 100755 (executable)
--- a/tests/ls/stat-dtype
+++ b/tests/ls/stat-dtype
@@ -14,7 +14,11 @@ fi
 # FIXME: use a more dynamic test for this, since whether d_type is useful
 # depends on much more than the file system type.  For example, with
 # linux-2.6.15, at least tmpfs and ext3 work, but reiserfs and xfs don't.
-df -t tmpfs -t ext3 . 2> /dev/null ||
+# 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
+test $skip = yes &&
   {
     echo "$0: '.' is not on a suitable file system for this test" 1>&2
     echo "$0: skipping this test" 1>&2