LU-11505 tests: customise run_*() functions

[fs/lustre-release.git] / lustre / tests / parallel-scale.sh

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index aea27cf..b7d9a82 100644 (file)
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -11,7 +11,7 @@ init_logging
 # bug number for skipped test:  LU-9429
      ALWAYS_EXCEPT="            parallel_grouplock  $PARALLEL_SCALE_EXCEPT "
 
-if [ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ]; then
+if [ "$mds1_FSTYPE" = zfs -o "$ost1_FSTYPE" = zfs ]; then
        ZFSSLOW=$SLOW
        SLOW=no
 
@@ -146,10 +146,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
@@ -161,6 +161,11 @@ test_statahead () {
 }
 run_test statahead "statahead test, multiple clients"
 
+test_rr_alloc () {
+       run_rr_alloc
+}
+run_test rr_alloc "Checking even file distribution over OSTs in RR policy"
+
 test_fs_test () {
        run_fs_test
 }
@@ -176,7 +181,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