LU-15050 tests: do not ignore SANITY_ONLY and SANITYN_ONLY

sanity 150[b,bb,c,d,f,g] and sanityn 107 tests are to be included
into SANITY_ONLY and SANITYN_ONLY lists only if these lists not
set by user.

Fixes: 3c75d2522786 ("LU-10664 dom: non-blocking enqueue for DOM locks")
Fixes: 163870abfb7c ("LU-14382 mdt: implement fallocate in MDC/MDT")
Test-Parameters: trivial testlist=sanity-dom env=SANITY_ONLY=1,SANITYN_ONLY=1
Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
Change-Id: I686731df3dfbfe1b7d4ae2e8621d1b0c10c48a22
Reviewed-on: https://review.whamcloud.com/45107
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andriy Skulysh <andriy.skulysh@hpe.com>

diff --git a/lustre/tests/sanity-dom.sh b/lustre/tests/sanity-dom.sh
index 742b773..8c5b16b 100644 (file)
--- a/lustre/tests/sanity-dom.sh
+++ b/lustre/tests/sanity-dom.sh
@@ -181,12 +181,14 @@ run_test fsx "Dual-mount fsx with DoM files"
 
 test_sanity()
 {
 
 test_sanity()
 {

-       SANITY_ONLY=${SANITY_ONLY:-"36 39 40 41 42d 42e 43 46 56r 101e 119a \
-                                   131 150a 155a 155b 155c 155d 207 241 251"}
+       local testlist="36 39 40 41 42d 42e 43 46 56r 101e 119a \
+                       131 150a 155a 155b 155c 155d 207 241 251"
+

        # Fallocate tests
        (( $MDS1_VERSION >= $(version_code 2.14.52) )) &&
        # Fallocate tests
        (( $MDS1_VERSION >= $(version_code 2.14.52) )) &&

-               SANITY_ONLY+=" 150b 150bb 150c 150d 150f 150g"
+               testlist+=" 150b 150bb 150c 150d 150f 150g"

 
 

+       SANITY_ONLY=${SANITY_ONLY:-$testlist}

        SANITY_REPEAT=${SANITY_REPEAT:-1}
        # XXX: to fix 45. Add 42a, c when LU-9693 fixed.
        # Add 42b when LU-6493 fixed
        SANITY_REPEAT=${SANITY_REPEAT:-1}
        # XXX: to fix 45. Add 42a, c when LU-9693 fixed.
        # Add 42b when LU-6493 fixed


@@ -199,13 +201,14 @@ run_test sanity "Run sanity with Data-on-MDT files"
 
 test_sanityn()
 {
 
 test_sanityn()
 {

-       SANITYN_ONLY=${SANITYN_ONLY:-"1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 \
-                                     23 27 39 51a 51c 51d"}
+       local testlist="1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 \
+                       23 27 39 51a 51c 51d"

 
        if [[ $MDS1_VERSION -ge $(version_code 2.13.55) ]]; then
 
        if [[ $MDS1_VERSION -ge $(version_code 2.13.55) ]]; then

-               SANITYN_ONLY+=" 107"
+               testlist+=" 107"

        fi
 
        fi
 

+       SANITYN_ONLY=${SANITYN_ONLY:-$testlist}

        SANITYN_REPEAT=${SANITYN_REPEAT:-1}
        # XXX: to fix 60
        ONLY=$SANITYN_ONLY ONLY_REPEAT=$SANITYN_REPEAT OSC="mdc" DOM="yes" \
        SANITYN_REPEAT=${SANITYN_REPEAT:-1}
        # XXX: to fix 60
        ONLY=$SANITYN_ONLY ONLY_REPEAT=$SANITYN_REPEAT OSC="mdc" DOM="yes" \