LU-6114 test: add $mbench_OPTIONS to run_metabench()

Cray's metabench version requires -p <dictionary> parameter.
Patch adds mbench_OPTIONS to metabench call.

Signed-off-by: Elena Gryaznova <elena.gryaznova@seagate.com>
Xyratex-bug-id: MRP-1113
Reviewed-by: Vladimir Saveliev <vladimir_saveliev@xyratex.com>
Reviewed-by: Alexander Lezhoev <Alexander_Lezhoev@xyratex.com>
Change-Id: Id00f96c034f3d2d501421c0dd435354becea7512
Reviewed-on: http://review.whamcloud.com/13388
Tested-by: Jenkins
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh
index 4dd72bd..fdacd3e 100644 (file)
--- a/lustre/tests/functions.sh
+++ b/lustre/tests/functions.sh
@@ -335,6 +335,7 @@ run_metabench() {
     mbench_NFILES=${mbench_NFILES:-30400}
     # threads per client
     mbench_THREADS=${mbench_THREADS:-4}
     mbench_NFILES=${mbench_NFILES:-30400}
     # threads per client
     mbench_THREADS=${mbench_THREADS:-4}

+       mbench_OPTIONS=${mbench_OPTIONS:-}

 
     [ x$METABENCH = x ] &&
         { skip_env "metabench not found" && return; }
 
     [ x$METABENCH = x ] &&
         { skip_env "metabench not found" && return; }


@@ -353,7 +354,7 @@ run_metabench() {
     # -S             Run the file stat tests.
     # -c nfile       Number of files to be used in each test.
     # -k             Cleanup.  Remove the test directories.
     # -S             Run the file stat tests.
     # -c nfile       Number of files to be used in each test.
     # -k             Cleanup.  Remove the test directories.

-    local cmd="$METABENCH -w $testdir -c $mbench_NFILES -C -S -k"
+       local cmd="$METABENCH -w $testdir -c $mbench_NFILES -C -S -k $mbench_OPTIONS"

     echo "+ $cmd"
 
        # find out if we need to use srun by checking $SRUN_PARTITION
     echo "+ $cmd"
 
        # find out if we need to use srun by checking $SRUN_PARTITION