From owner-svn-src-all@FreeBSD.ORG  Sun Nov 23 20:02:15 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2585A10656D2;
	Sun, 23 Nov 2008 20:02:15 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 12B9E8FC17;
	Sun, 23 Nov 2008 20:02:15 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mANK2EkR062622;
	Sun, 23 Nov 2008 20:02:14 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mANK2EWx062621;
	Sun, 23 Nov 2008 20:02:14 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <200811232002.mANK2EWx062621@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 23 Nov 2008 20:02:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185223 - head/tools/regression/fstest/tests
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Nov 2008 20:02:15 -0000

Author: pjd
Date: Sun Nov 23 20:02:14 2008
New Revision: 185223
URL: http://svn.freebsd.org/changeset/base/185223

Log:
  fstest for Linux:
  Automatically detect file system type.

Modified:
  head/tools/regression/fstest/tests/conf

Modified: head/tools/regression/fstest/tests/conf
==============================================================================
--- head/tools/regression/fstest/tests/conf	Sun Nov 23 19:59:42 2008	(r185222)
+++ head/tools/regression/fstest/tests/conf	Sun Nov 23 20:02:14 2008	(r185223)
@@ -4,5 +4,29 @@
 # Known operating systems: FreeBSD, SunOS, Linux
 os=`uname`
 
-# Known file systems: UFS, ZFS, other
-fs="UFS"
+case "${os}" in
+FreeBSD|Darwin)
+	#fs=`df -T . | tail -1 | awk '{print $2}'`
+	pattern="`df . | tail -1 | awk '{printf("%s on %s \n", $1, $6)}'`"
+	fs=`mount | egrep "^${pattern}" | awk -F '[(,]' '{print $2}'`
+	;;
+Solaris)
+	pattern="`df -k . | tail -1 | awk '{printf("%s on %s \n", $1, $6)}'`"
+	fs=`mount -v | egrep "^${pattern}" | awk '{print $5}'`
+	;;
+Linux)
+	fs=`df -PT . | tail -1 | awk '{print $2}'`
+	;;
+*)
+	echo "Unsupported operating system ${os}." >/dev/stderr
+	exit 1
+	;;
+esac
+
+# If we cannot figure out file system type, define it here.
+#fs="UFS"
+
+if [ -z "${fs}" ]; then
+	echo "Cannot figure out file system type, define it by hand." >/dev/stderr
+	exit 1
+fi