Branch: b_new_cmd

test fixes about sanity-65

diff --git a/lustre/tests/ll_dirstripe_verify.c b/lustre/tests/ll_dirstripe_verify.c
index 527fa9a..752e608 100644 (file)
--- a/lustre/tests/ll_dirstripe_verify.c
+++ b/lustre/tests/ll_dirstripe_verify.c
@@ -96,7 +96,7 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
 
                 stripe_count = (int)strtoul(buf, NULL, 10);;
         } else {
-                stripe_count = (int)lum_dir->lmm_stripe_count;
+                stripe_count = (signed short)lum_dir->lmm_stripe_count;
         }
         if (stripe_count == 0)
                 stripe_count = 1;

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 2602536..66af681 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2511,7 +2511,7 @@ test_65c() {
 }
 run_test 65c "directory setstripe $(($STRIPESIZE * 4)) 1 $(($OSTCOUNT - 1))"
 
-[ $STRIPECOUNT -eq 0 ] && sc=1 || sc=$(($STRIPECOUNT - 1))
+[ $STRIPECOUNT -eq 0 ] && sc=1 || sc=$STRIPECOUNT
 
 test_65d() {
        mkdir -p $DIR/d65