LU-13169 tests: add ONLY_REPEAT parameter to repeat subtests

[fs/lustre-release.git] / lustre / tests / functions.sh

diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh
index 23b53ef..f3e8909 100644 (file)
--- a/lustre/tests/functions.sh
+++ b/lustre/tests/functions.sh
@@ -51,7 +51,7 @@ lrepl() {
 EOF
 
     # Prompt escapes don't work in read -p, sadly.
-    prompt=":test_${testnum:-UNKNOWN}:$(uname -n):$(basename $PWD)% "
+    prompt=":${TESTNAME:-UNKNOWN}:$(uname -n):$(basename $PWD)% "
 
     # We use read -r to get close to a shell experience
     while read -e -r -p "$prompt" rawline; do
@@ -169,7 +169,7 @@ signaled() {
 }
 
 mpi_run () {
-    local mpirun="$MPIRUN $MPIRUN_OPTIONS"
+    local mpirun="$MPIRUN $MPIRUN_OPTIONS --oversubscribe"
     local command="$mpirun $@"
     local mpilog=$TMP/mpi.log
     local rc
@@ -526,7 +526,7 @@ run_connectathon() {
        fi
        echo "tests: $tests"
        for test in $tests; do
-               local cmd="./runtests -N $cnt_NRUN $test -f $testdir"
+               local cmd="sh ./runtests -N $cnt_NRUN $test -f $testdir"
                local rc=0
 
                log "$cmd"
@@ -968,7 +968,7 @@ run_rr_alloc() {
                [ -e $DIR/$tdir ] || $LFS mkdir -i 0 $DIR/$tdir
        fi
        chmod 0777 $DIR/$tdir
-       $SETSTRIPE -c 1 /$DIR/$tdir
+       $LFS setstripe -c 1 /$DIR/$tdir
 
        trap "cleanup_rr_alloc $clients $mntpt_root $rr_alloc_MNTPTS" EXIT ERR
        for i in $(seq 0 $((rr_alloc_MNTPTS - 1))); do
@@ -1033,7 +1033,7 @@ run_rr_alloc() {
        restore_lustre_params < $qos_prec_objs
        rm -f $qos_prec_objs
 
-       diff_max_min_arr=($($GETSTRIPE -r $DIR/$tdir/ |
+       diff_max_min_arr=($($LFS getstripe -r $DIR/$tdir/ |
                grep "lmm_stripe_offset:" | awk '{print $2}' | sort -n |
                uniq -c | awk 'NR==1 {min=max=$1} \
                { $1<min ? min=$1 : min; $1>max ? max=$1 : max} \