LU-10710 tests: fix run_write_disjoint line continuation

There is a problem with creating a command in
run_write_disjoint() due to a line continuation followed
on the next line by tabs. We need to remove the end
quotation before the line continuation and first
quotation mark on following line.

Test-Parameters: trivial testlist=parallel-scale
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I32dc620dd5c3e3d305d0bf985a096e69c18404d1
Reviewed-on: https://review.whamcloud.com/31645
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Elena Gryaznova <c17455@cray.com>
Reviewed-by: Saurabh Tandan <saurabh.tandan@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh
index b5ab487..5fc08ee 100644 (file)
--- a/lustre/tests/functions.sh
+++ b/lustre/tests/functions.sh
@@ -798,21 +798,21 @@ run_write_append_truncate() {
 }
 
 run_write_disjoint() {
+       if [ "$NFSCLIENT" ]; then
+               skip "skipped for NFSCLIENT mode"
+               return
+       fi
 
-    WRITE_DISJOINT=${WRITE_DISJOINT:-$(which write_disjoint \
-        2> /dev/null || true)}
-    # threads per client
-    wdisjoint_THREADS=${wdisjoint_THREADS:-4}
-    wdisjoint_REP=${wdisjoint_REP:-10000}
-       chunk_size_limit=$1
+       WRITE_DISJOINT=${WRITE_DISJOINT:-$(which write_disjoint 2> /dev/null ||
+                                          true)}
 
-    if [ "$NFSCLIENT" ]; then
-        skip "skipped for NFSCLIENT mode"
-        return
-    fi
+       [ x$WRITE_DISJOINT = x ] &&
+               { skip_env "write_disjoint not found" && return; }
 
-    [ x$WRITE_DISJOINT = x ] &&
-        { skip_env "write_disjoint not found" && return; }
+       # threads per client
+       wdisjoint_THREADS=${wdisjoint_THREADS:-4}
+       wdisjoint_REP=${wdisjoint_REP:-10000}
+       chunk_size_limit=$1
 
     # FIXME
     # Need space estimation here.
@@ -824,8 +824,8 @@ run_write_disjoint() {
     # mpi_run uses mpiuser
     chmod 0777 $testdir
 
-       local cmd="$WRITE_DISJOINT -f $testdir/file -n $wdisjoint_REP -m "\
-                         "$chunk_size_limit"
+       local cmd="$WRITE_DISJOINT -f $testdir/file -n $wdisjoint_REP -m \
+                       $chunk_size_limit"
 
        echo "+ $cmd"
        mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} \