From owner-svn-src-head@FreeBSD.ORG  Fri Jan 16 18:09:49 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE95E1065688;
	Fri, 16 Jan 2009 18:09:49 +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 DC9398FC12;
	Fri, 16 Jan 2009 18:09:49 +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 n0GI9nhK014803;
	Fri, 16 Jan 2009 18:09:49 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0GI9nkh014801;
	Fri, 16 Jan 2009 18:09:49 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <200901161809.n0GI9nkh014801@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Fri, 16 Jan 2009 18:09:49 +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: r187334 - head/tools/regression/fstest/tests
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2009 18:09:50 -0000

Author: pjd
Date: Fri Jan 16 18:09:49 2009
New Revision: 187334
URL: http://svn.freebsd.org/changeset/base/187334

Log:
  Be more Solaris-friendly.
  
  Submitted by:	Milan Cermak <Milan.Cermak@Sun.COM>

Modified:
  head/tools/regression/fstest/tests/conf
  head/tools/regression/fstest/tests/misc.sh

Modified: head/tools/regression/fstest/tests/conf
==============================================================================
--- head/tools/regression/fstest/tests/conf	Fri Jan 16 18:00:25 2009	(r187333)
+++ head/tools/regression/fstest/tests/conf	Fri Jan 16 18:09:49 2009	(r187334)
@@ -6,15 +6,19 @@ os=`uname`
 
 case "${os}" in
 FreeBSD|Darwin)
+	GREP=grep
 	#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}'`
+Solaris|SunOS)
+	GREP=ggrep
+	pattern=`df -k . | tail -1 | awk '{printf("%s on %s \n", $1, $6)}'`
+	fs=`mount -v | egrep "^${pattern}" | awk '{print $5}' | \
+	    tr -s '[:lower:]' '[:upper:]'`
 	;;
 Linux)
+	GREP=grep
 	fs=`df -PT . | tail -1 | awk '{print $2}'`
 	;;
 *)

Modified: head/tools/regression/fstest/tests/misc.sh
==============================================================================
--- head/tools/regression/fstest/tests/misc.sh	Fri Jan 16 18:00:25 2009	(r187333)
+++ head/tools/regression/fstest/tests/misc.sh	Fri Jan 16 18:09:49 2009	(r187334)
@@ -87,7 +87,7 @@ test_check()
 
 todo()
 {
-	echo "${os}" | grep -iq "${1}"
+	echo "${os}" | $GREP -iq "${1}"
 	if [ $? -eq 0 ]; then
 		todomsg="${2}"
 	fi