X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-quota-old.sh;h=8a1d26720a86a2bf8c3e192e13d7b7fc45452a9a;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hp=3cfa36dc73abdde443635778b05ff75e7013b5c9;hpb=d6f2a9fcfd8d3b14e05e3f1f660ba2ead9f81879;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-quota-old.sh b/lustre/tests/sanity-quota-old.sh
index 3cfa36d..8a1d267 100755
--- a/lustre/tests/sanity-quota-old.sh
+++ b/lustre/tests/sanity-quota-old.sh
@@ -147,11 +147,6 @@ FAIL_ON_ERROR=false
 run_test_with_stat() {
 	(($# != 2)) && error "the number of arguments is wrong"
 
-	if [ "$USE_OFD" == "yes" ]; then
-		run_test "$@"
-		return
-	fi
-
 	do_facet $SINGLEMDS "lctl set_param lquota.mdd_obd-${FSNAME}-MDT*.stats=0" > /dev/null
 	for j in `seq $OSTCOUNT`; do
 	    do_facet ost$j "lctl set_param lquota.${FSNAME}-OST*.stats=0" > /dev/null
@@ -1866,6 +1861,7 @@ test_25_sub() {
 	resetquota $1 $TSTUSR2
 }
 
+# b=18081
 test_25() {
 	log "run for chown case"
 	test_25_sub -u
@@ -1873,7 +1869,7 @@ test_25() {
 	log "run for chgrp case"
 	test_25_sub -g
 }
-run_test_with_stat 25 "test whether quota usage is transfered when chown/chgrp (18081) ==========="
+run_test_with_stat 25 "test if quota usage is transferred on chown/chgrp"
 
 test_26() {
 	mkdir -p $DIR/$tdir
@@ -2405,7 +2401,10 @@ quota_fini()
 quota_fini
 
 cd $ORIG_PWD
-complete sanity-quota.sh $SECONDS
+
+# override TESTSUITE so Maloo keeps only one set of sanity-quota results
+TESTSUITE=sanity-quota.sh
+complete $SECONDS
 check_and_cleanup_lustre
 export QUOTA_AUTO=$QUOTA_AUTO_OLD
 exit_status