Branch: HEAD

[fs/lustre-release.git] / lustre / tests / sanity-fid.sh

diff --git a/lustre/tests/sanity-fid.sh b/lustre/tests/sanity-fid.sh
index 5d61718..2da851a 100644 (file)
--- a/lustre/tests/sanity-fid.sh
+++ b/lustre/tests/sanity-fid.sh
@@ -10,6 +10,7 @@ ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-""}
 
 SRCDIR=`dirname $0`
 export PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH
+export SECURITY=${SECURITY:-"null"}
 
 TMP=${TMP:-/tmp}
 FSTYPE=${FSTYPE:-ext3}
@@ -34,13 +35,7 @@ IOPENTEST2=${IOPENTEST2:-iopentest2}
 PTLDEBUG=${PTLDEBUG:-0}
 MODE=${MODE:mds}
 
-if [ $UID -ne 0 ]; then
-       RUNAS_ID="$UID"
-       RUNAS=""
-else
-       RUNAS_ID=${RUNAS_ID:-500}
-       RUNAS=${RUNAS:-"runas -u $RUNAS_ID"}
-fi
+. krb5_env.sh
 
 export NAME=${NAME:-local}
 
@@ -86,7 +81,7 @@ check_kernel_version() {
 }
 
 run_one() {
-       if ! mount | grep -q $DIR; then
+       if ! cat /proc/mounts | grep -q $DIR; then
                $START
        fi
        echo $PTLDEBUG >/proc/sys/portals/debug 
@@ -209,7 +204,7 @@ test_1a() {
        }
         rm -fr $DIR/1a0 || error
 }
-run_test 1a " fid managing correctness ============="
+run_test 1a " fid correctness (create) ============="
 
 test_1b() {
         rm -fr $DIR/1b0 > /dev/null
@@ -237,7 +232,7 @@ test_1b() {
        }
         rm -fr $DIR/1b0 || error
 }
-run_test 1b " fid managing correctness ============="
+run_test 1b " fid correctness (remove) ============="
 
 TMPDIR=$OLDTMPDIR
 TMP=$OLDTMP