From: Jim Meyering <jim@meyering.net>
Date: Sun, 24 Sep 2006 07:27:00 +0000 (+0000)
Subject: * tests/ls/stat-dtype: Don't use tmpfs on linux-2.4 or older,
X-Git-Tag: v6.3~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4963a7f707de1556dbbc92cd3f0d7ca58f31a1a;p=thirdparty%2Fcoreutils.git

* tests/ls/stat-dtype: Don't use tmpfs on linux-2.4 or older,
since that predated addition of d_type support.
---

diff --git a/ChangeLog b/ChangeLog
index d2e604d5ba..152e31d307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-24  Jim Meyering  <jim@meyering.net>
+
+	* tests/ls/stat-dtype: Don't use tmpfs on linux-2.4 or older,
+	since that predated addition of d_type support.
+
 2006-09-23  Jim Meyering  <jim@meyering.net>
 
 	* gl/modules/getloadavg.diff: New file.  Work around the way the latest
diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype
index dad4552159..153195cd32 100755
--- a/tests/ls/stat-dtype
+++ b/tests/ls/stat-dtype
@@ -37,7 +37,18 @@ fi
 # Also, tmpfs on Solaris 10 lacks d_type support.
 skip=yes
 fs_type=`stat -f --printf %T .`
-test `uname -s` = Linux && test $fs_type = tmpfs && skip=no
+
+linux_2_6_or_newer=0
+case `uname -r` in
+  [01].*) ;;
+  2.[0-5]*) ;;
+  *) linux_2_6_or_newer=1 ;;
+esac
+
+test `uname -s` = Linux \
+  && test $linux_2_6_or_newer = 1 \
+  && test $fs_type = tmpfs \
+  && skip=no
 test $fs_type = ext2/ext3 && skip=no
 test $skip = yes &&
   {