X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flfsck-performance.sh;h=6f98f969b874648aabb0169af76db2a521347477;hb=e5923357b4ec5177e8cc540c5603f0f9df41de1e;hp=dc873bfb1e7b31af9021db231b70aeb788030ead;hpb=54b9e3f789358bd9dfb94b77fe33a4faa1e28ab2;p=fs%2Flustre-release.git

diff --git a/lustre/tests/lfsck-performance.sh b/lustre/tests/lfsck-performance.sh
index dc873bf..6f98f96 100644
--- a/lustre/tests/lfsck-performance.sh
+++ b/lustre/tests/lfsck-performance.sh
@@ -3,21 +3,20 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-ALWAYS_EXCEPT="$LFSCK_PERFORMANCE_EXCEPT"
-[ "$SLOW" = "no" ] && EXCEPT_SLOW=""
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+ALWAYS_EXCEPT="$LFSCK_PERFORMANCE_EXCEPT"
+build_test_filter
+
 require_dsh_mds || exit 0
 require_dsh_ost || exit 0
 
 [ "$SLOW" = "no" ] &&
-	skip "skip lfsck performance test under non-SLOW mode" && exit 0
+	skip "skip lfsck performance test under non-SLOW mode"
 
 NTHREADS=${NTHREADS:-0}
 UNIT=${UNIT:-8192}
@@ -129,8 +128,6 @@ lfsck_create_nfiles() {
 	done
 }
 
-build_test_filter
-
 format_start_mgs () {
 	do_rpc_nodes $(facet_active_host mgs) load_modules_local
 	format_mgs
@@ -179,8 +176,8 @@ test_0() {
 run_test 0 "lfsck namespace performance (routine case) without load"
 
 test_1() {
-	[ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
-		skip "not implemented for ZFS" && return
+	[ "$mds1_FSTYPE" != ldiskfs ] &&
+		skip_env "not implemented for ZFS"
 
 	local BCOUNT=0
 	local i
@@ -932,7 +929,7 @@ test_7c() {
 run_test 7c "namespace LFSCK performance (repairing bad FID-in-dirent) for DNE"
 
 test_8() {
-	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	[ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs"
 
 	[ $INCFACTOR -gt 25 ] && INCFACTOR=25