From 092513dad4c74441b2b92b6e51b0c6cff2e06b89 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Fri, 16 Jan 2009 18:09:49 +0000
Subject: [PATCH] Be more Solaris-friendly.

Submitted by:	Milan Cermak <Milan.Cermak@Sun.COM>
---
 tools/regression/fstest/tests/conf    | 10 +++++++---
 tools/regression/fstest/tests/misc.sh |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/regression/fstest/tests/conf b/tools/regression/fstest/tests/conf
index 73496e33fda7..33e68f86bd11 100644
--- a/tools/regression/fstest/tests/conf
+++ b/tools/regression/fstest/tests/conf
@@ -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}'`
 	;;
 *)
diff --git a/tools/regression/fstest/tests/misc.sh b/tools/regression/fstest/tests/misc.sh
index 60764a91a00f..97fe07cc4173 100644
--- a/tools/regression/fstest/tests/misc.sh
+++ b/tools/regression/fstest/tests/misc.sh
@@ -87,7 +87,7 @@ test_check()
 
 todo()
 {
-	echo "${os}" | grep -iq "${1}"
+	echo "${os}" | $GREP -iq "${1}"
 	if [ $? -eq 0 ]; then
 		todomsg="${2}"
 	fi