svn commit: r211108 - head/tools/regression/fstest/tests

[Pawel Jakub Dawidek]

Author: pjd
Date: Mon Aug  9 17:37:29 2010
New Revision: 211108
URL: http://svn.freebsd.org/changeset/base/211108

Log:
  Small tweaks.

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	Mon Aug  9 17:34:57 2010	(r211107)
+++ head/tools/regression/fstest/tests/conf	Mon Aug  9 17:37:29 2010	(r211108)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 # fstest configuration file
 
-# Known operating systems: FreeBSD, SunOS, Linux
+# Supported operating systems: FreeBSD, Darwin, SunOS, Linux
 os=`uname`
 
 case "${os}" in
@@ -9,12 +9,12 @@ 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 toupper($2)}'`
+	fs=`mount | ${GREP} -E "^${pattern}" | awk -F '[(,]' '{print toupper($2)}'`
 	;;
 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}' | \
+	fs=`mount -v | ${GREP} -E "^${pattern}" | awk '{print $5}' | \
 	    tr -s '[:lower:]' '[:upper:]'`
 	;;
 Linux)

Modified: head/tools/regression/fstest/tests/misc.sh
==============================================================================
--- head/tools/regression/fstest/tests/misc.sh	Mon Aug  9 17:34:57 2010	(r211107)
+++ head/tools/regression/fstest/tests/misc.sh	Mon Aug  9 17:37:29 2010	(r211108)
@@ -25,7 +25,7 @@ expect()
 	e="${1}"
 	shift
 	r=`${fstest} $* 2>/dev/null | tail -1`
-	echo "${r}" | ${GREP} -E '^'${e}'$' >/dev/null 2>&1
+	echo "${r}" | ${GREP} -Eq '^'${e}'$'
 	if [ $? -eq 0 ]; then
 		if [ -z "${todomsg}" ]; then
 			echo "ok ${ntest}"
@@ -40,7 +40,7 @@ expect()
 		fi
 	fi
 	todomsg=""
-	ntest=`expr $ntest + 1`
+	ntest=$((ntest+1))
 }
 
 jexpect()
@@ -50,7 +50,7 @@ jexpect()
 	e="${3}"
 	shift 3
 	r=`jail -s ${s} / fstest 127.0.0.1 /bin/sh -c "cd ${d} && ${fstest} $* 2>/dev/null" | tail -1`
-	echo "${r}" | ${GREP} -E '^'${e}'$' >/dev/null 2>&1
+	echo "${r}" | ${GREP} -Eq '^'${e}'$'
 	if [ $? -eq 0 ]; then
 		if [ -z "${todomsg}" ]; then
 			echo "ok ${ntest}"
@@ -65,7 +65,7 @@ jexpect()
 		fi
 	fi
 	todomsg=""
-	ntest=`expr $ntest + 1`
+	ntest=$((ntest+1))
 }
 
 test_check()
@@ -84,7 +84,7 @@ test_check()
 		fi
 	fi
 	todomsg=""
-	ntest=`expr $ntest + 1`
+	ntest=$((ntest+1))
 }
 
 todo()