X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale.sh;h=c82a30233ac59a7ab174ba512340a0933389b8a8;hb=ff35e27da4c76bc93c7641ef54d425d77e821e9f;hp=840a8b8cdc20b217c0f6aad7f4d06689cd536b2b;hpb=21501dedf64e027b529a3382d92bf4bf8039638c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index 840a8b8..c82a302 100644
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -1,17 +1,15 @@
 #!/bin/bash
-#
-#set -vx
 
-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
 
-# bug number for skipped test:  LU-9429
-     ALWAYS_EXCEPT="            parallel_grouplock  $PARALLEL_SCALE_EXCEPT "
+ALWAYS_EXCEPT="$PARALLEL_SCALE_EXCEPT "
+# bug number for skipped test: LU-9429
+ALWAYS_EXCEPT+="               parallel_grouplock "
 
-if [ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ]; then
+if [ "$mds1_FSTYPE" = zfs -o "$ost1_FSTYPE" = zfs ]; then
 	ZFSSLOW=$SLOW
 	SLOW=no
 
@@ -22,11 +20,12 @@ if [ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ]; then
 	statahead_NUMFILES=${statahead_NUMFILES:-100000}
 fi
 
+build_test_filter
+
 # common setup
-MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
 clients=${CLIENTS:-$HOSTNAME}
 generate_machine_file $clients $MACHINEFILE ||
-    error "Failed to generate machine file"
+	error "Failed to generate machine file"
 num_clients=$(get_node_count ${clients//,/ })
 
 # compilbench
@@ -67,7 +66,6 @@ fi
 
 . $LUSTRE/tests/functions.sh
 
-build_test_filter
 check_and_setup_lustre
 
 get_mpiuser_id $MPI_USER
@@ -146,10 +144,10 @@ test_write_disjoint() {
 run_test write_disjoint "write_disjoint"
 
 # Make sure to exercise the tiny write code
-test_write_disjoint() {
-    run_write_disjoint 16384
+test_write_disjoint_tiny() {
+	run_write_disjoint 16384
 }
-run_test write_disjoint "write_disjoint_tiny"
+run_test write_disjoint_tiny "write_disjoint_tiny"
 
 test_parallel_grouplock() {
     run_parallel_grouplock
@@ -181,7 +179,8 @@ test_xdd () {
 }
 run_test xdd "xdd"
 
-[ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ] &&
+# If necessary, return SLOW to its original value
+[ "$mds1_FSTYPE" = zfs -o "$ost1_FSTYPE" = zfs ] &&
 	SLOW=$ZFSSLOW
 
 complete $SECONDS