diff options
| author | pjd <pjd@FreeBSD.org> | 2009-01-16 18:09:49 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2009-01-16 18:09:49 +0000 |
| commit | ac0e50279760f174435ba6367200b16bf50355fb (patch) | |
| tree | a388d1765654943b9123b088bfba07815e9935cb /tools | |
| parent | a8d4dcbeed2e90041cfb1f2488bea51f88803784 (diff) | |
| download | FreeBSD-src-ac0e50279760f174435ba6367200b16bf50355fb.zip FreeBSD-src-ac0e50279760f174435ba6367200b16bf50355fb.tar.gz | |
Be more Solaris-friendly.
Submitted by: Milan Cermak <Milan.Cermak@Sun.COM>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/regression/fstest/tests/conf | 10 | ||||
| -rw-r--r-- | 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 73496e3..33e68f8 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 60764a9..97fe07c 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 |
