diff options
| author | pjd <pjd@FreeBSD.org> | 2010-08-09 17:37:29 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2010-08-09 17:37:29 +0000 |
| commit | b69af9bb70903885409ce4728869d0c53252c154 (patch) | |
| tree | b4b13b833e3ee86fb09132622b4264a80ee718c8 /tools/regression/fstest/tests | |
| parent | a26561868eb1d47cc51d03534150ac046171f23c (diff) | |
| download | FreeBSD-src-b69af9bb70903885409ce4728869d0c53252c154.zip FreeBSD-src-b69af9bb70903885409ce4728869d0c53252c154.tar.gz | |
Small tweaks.
Diffstat (limited to 'tools/regression/fstest/tests')
| -rw-r--r-- | tools/regression/fstest/tests/conf | 6 | ||||
| -rw-r--r-- | tools/regression/fstest/tests/misc.sh | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/regression/fstest/tests/conf b/tools/regression/fstest/tests/conf index 6471e22..43da804 100644 --- a/tools/regression/fstest/tests/conf +++ b/tools/regression/fstest/tests/conf @@ -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) diff --git a/tools/regression/fstest/tests/misc.sh b/tools/regression/fstest/tests/misc.sh index 2f99bf2..9e6da96 100644 --- a/tools/regression/fstest/tests/misc.sh +++ b/tools/regression/fstest/tests/misc.sh @@ -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() |
