b=14512

[fs/lustre-release.git] / lustre / tests / sanityN.sh

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index a0175e7..752c336 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -7,7 +7,7 @@ ONLY=${ONLY:-"$*"}
 ALWAYS_EXCEPT="14b 28 $SANITYN_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 16"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="12 16"
 
 # Tests that fail on uml
 [ "$UML" = "true" ] && EXCEPT="$EXCEPT 7"
@@ -75,6 +75,8 @@ OSTCOUNT=`cat $LPROC/lov/$LOVNAME/numobd`
 
 rm -rf $DIR1/[df][0-9]* $DIR1/lnk
 
+check_runas_id $RUNAS_ID $RUNAS
+
 build_test_filter
 
 test_1a() {
@@ -335,7 +337,7 @@ run_test 15 "test out-of-space with multiple writers ==========="
 
 test_16() {
        rm -f $MOUNT1/fsxfile
-       lfs setstripe $MOUNT1/fsxfile 0 -1 -1 # b=10919
+       lfs setstripe $MOUNT1/fsxfile -c -1 # b=10919
        fsx -c 50 -p 100 -N 2500 -l $((SIZE * 256)) -S 0 $MOUNT1/fsxfile $MOUNT2/fsxfile
 }
 run_test 16 "2500 iterations of dual-mount fsx ================="
@@ -488,7 +490,6 @@ test_25() {
        [ `cat $LPROC/mdc/*-mdc-*/connect_flags | grep -c acl` -lt 2 ] && \
            skip "must have acl, skipping" && return
 
-       mkdir $DIR1/$tdir || error "mkdir $DIR1/$tdir"
        touch $DIR1/$tdir/f1 || error "touch $DIR1/$tdir/f1"
        chmod 0755 $DIR1/$tdir/f1 || error "chmod 0755 $DIR1/$tdir/f1"
 
@@ -551,7 +552,7 @@ test_28() { # bug 9977
        ECHO_UUID="ECHO_osc1_UUID"
        tOST=`$LCTL dl | | awk '/-osc-|OSC.*MNT/ { print $4 }' | head -1`
 
-       lfs setstripe $DIR1/$tfile 1048576 0 2
+       lfs setstripe $DIR1/$tfile -s 1048576 -i 0 -c 2
        tOBJID=`lfs getstripe $DIR1/$tfile |grep "^[[:space:]]\+1" |awk '{print $2}'`
        dd if=/dev/zero of=$DIR1/$tfile bs=1024k count=2
 
@@ -597,8 +598,6 @@ test_29() { # bug 10999
 #run_test 29 "lock put race between glimpse and enqueue ========="
 
 test_30() { #bug #11110
-    rm -rf $DIR1/$tdir
-    mkdir -p $DIR1/$tdir
     cp -f /bin/bash $DIR1/$tdir/bash
     /bin/sh -c 'sleep 1; rm -f $DIR2/$tdir/bash; cp /bin/bash $DIR2/$tdir' &
     err=$($DIR1/$tdir/bash -c 'sleep 2; openfile -f O_RDONLY /proc/$$/exe >& /dev/null; echo $?')