X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fperformance-sanity.sh;h=c4004ff56a8668360126713f1cd38bd0bc9d75e5;hb=010425898fa4b2abc6325a8073e20cb994ce7947;hp=698d310d121ff90736718e8226823361a83121d1;hpb=1ebd3fc8f67d7c073d5722e48180169b16887b6b;p=fs%2Flustre-release.git

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index 698d310..c4004ff 100644
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -1,28 +1,21 @@
 #!/bin/bash
-#set -vx
 set -e
 
-TESTNAME=`basename $0 .sh`
-TMP=${TMP:-/tmp}
+TESTNAME=$(basename $0 .sh)
 LOG=${LOG:-"$TMP/${TESTNAME}.log"}
 
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+ALWAYS_EXCEPT="$PERFORMANCE_SANITY_EXCEPT "
+build_test_filter
+
 [ -x "$MDSRATE" ] || FAIL_ON_ERROR=true error "No mdsrate program. Aborting."
 which mpirun > /dev/null 2>&1 ||
 	FAIL_ON_ERROR=true error "No mpirun program. Aborting."
 
-# Skip these tests
-# bug number:
-ALWAYS_EXCEPT="  $PERFORMANCE_SANITY_EXCEPT"
-
-build_test_filter
-
 get_mpiuser_id $MPI_USER
 MPI_RUNAS=${MPI_RUNAS:-"runas -u $MPI_USER_UID -g $MPI_USER_GID"}
 $GSS_KRB5 && refresh_krb5_tgt $MPI_USER_UID $MPI_USER_GID $MPI_RUNAS
@@ -36,13 +29,13 @@ run_test 3 "small file create/open/delete ======"
 
 # mdsrate-create-large
 test_4() {
-    # LU-2600/LU-4108 - Decrease load on zfs
-    [ "$SLOW" = no -a $(facet_fstype $SINGLEMDS) = zfs ] &&
-	NUM_FILES=10000
-    echo "Large file creation performance"
-    bash mdsrate-create-large.sh
+	# LU-2600/LU-4108 - Decrease load on zfs
+	[ "$SLOW" = no -a "$mds1_FSTYPE" = zfs ] &&
+		NUM_FILES=10000
+	echo "Large file creation performance"
+	bash mdsrate-create-large.sh
 }
-run_test 4 "large file create/open/delete ======"
+run_test 4 "large file create/open/delete"
 
 # mdsrate-lookup-1dir
 test_5() {