Branch b1_6

b=16294
i=ZhiYong Tian(tianzy)

suppress output of user check

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index c877567..3a8e614 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -1155,7 +1155,7 @@ test_14b(){
 
         MISSING_USERS=""
         for i in `seq 1 30`; do
-                check_runas_id_ret quota15_$i "runas -u quota15_$i"
+                check_runas_id_ret quota15_$i "runas -u quota15_$i" >/dev/null 2>/dev/null
                 if [ "$?" != "0" ]; then
                        MISSING_USERS="$MISSING_USERS quota15_$i"
                 fi
@@ -1171,10 +1171,11 @@ test_14b(){
         quota_set_version 1
         echo "running quotacheck"
         $LFS quotacheck -ug $DIR
+        mkdir -p $DIR/$tdir
         chmod 0777 $DIR/$tdir
         for i in `seq 1 30`; do
                 l=$[$i*1024*128] # set limits in 128 Mb units
-                $LFS setquota -u quota15_$i $l $l $l $l $DIR || error "lfs setquota failed"
+                $LFS setquota -u quota15_$i -b $l -B $l -i $l -I $l $DIR || error "lfs setquota failed"
                 runas -u quota15_$i dd if=/dev/zero of="$DIR/$tdir/quota15_$i" \
                       bs=1048576 count=$[($i+1)/2] || error "dd failed"
         done
@@ -1208,7 +1209,7 @@ test_14b(){
                 echo "...real is $l"
                 [ "$l" -eq "${CURSPACE[$i]}" ] || error "curspace mismatch"
                 rm $DIR/$tdir/quota15_$i || error "could not remove quota15_$i"
-                $LFS setquota -u quota15_$i 0 0 0 0 $DIR || error "ifs setquota clear failed"
+                $LFS setquota -u quota15_$i -b 0 -B 0 -i 0 -I 0 $DIR || error "ifs setquota clear failed"
         done
 }
 run_test 14b "setting 30 quota entries in quota v1 file before conversion ==="