LU-6345 test: compare /bin/sleep in sanity-hsm.sh test_30c

[fs/lustre-release.git] / lustre / tests / sanity-sec.sh

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index a70ea40..b50bf96 100644 (file)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -7,8 +7,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 19430 LU-5423 19967 19967
-ALWAYS_EXCEPT="                2     4       5     6    $SANITY_SEC_EXCEPT"
+# bug number for skipped test: 19430 19967 19967
+ALWAYS_EXCEPT="                2     5     6    $SANITY_SEC_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [ "$ALWAYS_EXCEPT$EXCEPT" ] && \
@@ -1417,7 +1417,10 @@ test_fops() {
        local mds_i
        local rc=0
        local perm_bit_list="0 3 $((0300)) $((0303))"
-       [ "$SLOW" == "yes" ] && perm_bit_list=$(seq 0 511)
+       # SLOW tests 000-007, 010-070, 100-700 (octal modes)
+       [ "$SLOW" == "yes" ] &&
+               perm_bit_list="0 $(seq 1 7) $(seq 8 8 63) $(seq 64 64 511) \
+                              $((0303))"
 
        # step through mds users. -1 means root
        for mds_i in -1 0 1 2; do
@@ -1473,8 +1476,8 @@ nodemap_test_setup() {
        do_facet mgs $LCTL set_param $IDENTITY_UPCALL=NONE
 
        remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-       [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] &&
-               skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" &&
+       [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.6.90) ] &&
+               skip "Skip test on $(get_lustre_version) MGS, need 2.6.90+" &&
                return
 
        rc=0