From db7ffe5582b7c66006877b0810656486be248666 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 10 Aug 2006 09:22:33 +0000
Subject: * 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.

---
 tests/ls/stat-dtype | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tests/ls')

diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype
index e94c2eb31..5148d5acd 100755
--- 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
-- 
cgit v1.2.3-70-g09d2