From 8ba003dbc80f0280f1d68bf512329ddbe1a07dd0 Mon Sep 17 00:00:00 2001 From: Jiri Palecek Date: Wed, 21 Oct 2009 02:19:58 +0200 Subject: [PATCH] Fix some bashisms --- testcases/kernel/fs/fs-bench/modaltr.sh | 2 +- testcases/kernel/fs/mongo/test.sh | 8 +++----- testcases/network/tcp_cmds/netstat/netstat01 | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testcases/kernel/fs/fs-bench/modaltr.sh b/testcases/kernel/fs/fs-bench/modaltr.sh index 85d2c30..36e6f0c 100755 --- a/testcases/kernel/fs/fs-bench/modaltr.sh +++ b/testcases/kernel/fs/fs-bench/modaltr.sh @@ -43,7 +43,7 @@ LOG_DIR1=/tmp/log1 HOME_DIR=/home BLOCK_DIR=/dev/mtdblock export PATH=$PATH:/sbin - if [ $UID -ne 0 ]; + if [ $(id -ru) -ne 0 ]; then echo "must be root to run this" exit diff --git a/testcases/kernel/fs/mongo/test.sh b/testcases/kernel/fs/mongo/test.sh index fe75664..eccb079 100755 --- a/testcases/kernel/fs/mongo/test.sh +++ b/testcases/kernel/fs/mongo/test.sh @@ -26,7 +26,7 @@ TEST_DIR=testdir #should be root to execute this script . - if [ $UID -ne 0 ]; then + if [ $(id -ru) -ne 0 ]; then echo "This script must be run as root" exit fi @@ -52,8 +52,7 @@ modprobe loop fi #run the mongo test on reiserfs file system type -function reiserfs - +reiserfs() { cat > fs.sh <> fs.sh <&1 1>/dev/null; then + if ! netstat $flag 1>/dev/null 2>&1; then end_testcase "$COMMAND failed" fi done -- 1.6.4.3