b=17873

i=Adilger
use skip_env instead of skip if
environment is not configured properly

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 50d746d..0732fec 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -490,7 +490,7 @@ test_18() {
                 [ $SPACE -gt $((MIN / 20)) ] && OK=1 && myMDSSIZE=$MIN && \
                         log "use file $MDSDEV with MIN=$MIN"
 
-        [ -z "$OK" ] && skip "$MDSDEV too small for ${MIN}kB MDS" && return
+        [ -z "$OK" ] && skip_env "$MDSDEV too small for ${MIN}kB MDS" && return
 
 
         echo "mount mds with large journal..."
@@ -695,7 +695,7 @@ test_24a() {
        [ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST
        if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" ]; then
                do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
-               skip "mixed loopback and real device not working" && return
+               skip_env "mixed loopback and real device not working" && return
        fi
 
        local fs2mdsdev=${fs2mds_DEV:-${MDSDEV}_2}
@@ -741,7 +741,7 @@ run_test 24a "Multiple MDTs on a single node"
 test_24b() {
        if [ -z "$fs2mds_DEV" ]; then
                do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
-               skip "mixed loopback and real device not working" && return
+               skip_env "mixed loopback and real device not working" && return
        fi
 
        local fs2mdsdev=${fs2mds_DEV:-${MDSDEV}_2}
@@ -840,7 +840,7 @@ test_28() {
 run_test 28 "permanent parameter setting"
 
 test_29() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2, skipping" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2, skipping" && return
         setup > /dev/null 2>&1
        start_ost2
        sleep 10
@@ -975,14 +975,14 @@ test_32a() {
        # this test is totally useless on a client-only system
        [ -n "$CLIENTONLY" -o -n "$CLIENTMODSONLY" ] && skip "client only testing" && return 0
        [ "$NETTYPE" = "tcp" ] || { skip "NETTYPE != tcp" && return 0; }
-       [ -z "$TUNEFS" ] && skip "No tunefs" && return 0
+       [ -z "$TUNEFS" ] && skip_env "No tunefs" && return 0
 
        local DISK1_8=$LUSTRE/tests/disk1_8.tar.bz2
-       [ ! -r $DISK1_8 ] && skip "Cannot find $DISK1_8" && return 0
+       [ ! -r $DISK1_8 ] && skip_env "Cannot find $DISK1_8" && return 0
        local tmpdir=$TMP/conf32a
        mkdir -p $tmpdir
        tar xjvf $DISK1_8 -C $tmpdir || \
-               { skip "Cannot untar $DISK1_8" && return 0; }
+               { skip_env "Cannot untar $DISK1_8" && return 0; }
 
        load_modules
        $LCTL set_param debug=$PTLDEBUG
@@ -1033,14 +1033,14 @@ test_32b() {
        # this test is totally useless on a client-only system
        [ -n "$CLIENTONLY" -o -n "$CLIENTMODSONLY" ] && skip "client only testing" && return 0
        [ "$NETTYPE" = "tcp" ] || { skip "NETTYPE != tcp" && return 0; }
-       [ -z "$TUNEFS" ] && skip "No tunefs" && return
+       [ -z "$TUNEFS" ] && skip_env "No tunefs" && return
 
        local DISK1_8=$LUSTRE/tests/disk1_8.tar.bz2
-       [ ! -r $DISK1_8 ] && skip "Cannot find $DISK1_8" && return 0
+       [ ! -r $DISK1_8 ] && skip_env "Cannot find $DISK1_8" && return 0
        local tmpdir=$TMP/conf32b
        mkdir -p $tmpdir
        tar xjvf $DISK1_8 -C $tmpdir || \
-               { skip "Cannot untar $DISK1_8" && return ; }
+               { skip_env "Cannot untar $DISK1_8" && return ; }
 
        load_modules
        $LCTL set_param debug=$PTLDEBUG
@@ -1102,7 +1102,7 @@ test_33a() { # bug 12333, was test_33
 
         if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" ]; then
                 do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
-                skip "mixed loopback and real device not working" && return
+                skip_env "mixed loopback and real device not working" && return
         fi
 
         local fs2mdsdev=${fs2mds_DEV:-${MDSDEV}_2}
@@ -1246,9 +1246,9 @@ test_36() { # 12743
 
         if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" -o -z "$fs3ost_DEV" ]; then
                do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
-               skip "mixed loopback and real device not working" && return
+               skip_env "mixed loopback and real device not working" && return
         fi
-        [ $OSTCOUNT -lt 2 ] && skip "skipping test for single OST" && return
+        [ $OSTCOUNT -lt 2 ] && skip_env "skipping test for single OST" && return
 
        [ "$ost_HOST" = "`hostname`" -o "$ost1_HOST" = "`hostname`" ] || \
                { skip "remote OST" && return 0; }
@@ -1448,7 +1448,7 @@ test_42() { #bug 14693
 run_test 42 "invalid config param should not prevent client from mounting"
 
 test_43() {
-    [ $UID -ne 0 -o $RUNAS_ID -eq 0 ] && skip "run as root"
+    [ $UID -ne 0 -o $RUNAS_ID -eq 0 ] && skip_env "run as root"
     setup
     chmod ugo+x $DIR || error "chmod 0 failed"
     set_and_check mds                                        \
@@ -1608,7 +1608,7 @@ cleanup_46a() {
 }
 
 test_46a() {
-       [ $OSTCOUNT -lt 5 ] && skip "skipping test for too few OSTs" && return
+       [ $OSTCOUNT -lt 5 ] && skip_env "too few OSTs" && return
        reformat
        start_mds || return 1
        #first client should see only one ost

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index fb5d5e5..185c864 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -900,7 +900,7 @@ run_test 40 "cause recovery in ptlrpc, ensure IO continues"
 # assert on trying to unlock the unlocked page.
 test_41() {
     [ $OSTCOUNT -lt 2 ] && \
-       skip "skipping test 41: we don't have a second OST to test with" && \
+       skip_env "skipping test 41: we don't have a second OST to test with" && \
        return
 
     local f=$MOUNT/$tfile
@@ -1060,7 +1060,7 @@ run_test 47 "MDS->OSC failure during precreate cleanup (2824)"
 
 test_48() {
     remote_ost_nodsh && skip "remote OST with nodsh" && return 0
-    [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs -- skipping" && return
+    [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" && return
 
     replay_barrier $SINGLEMDS
     createmany -o $DIR/$tfile 20  || return 1
@@ -1934,7 +1934,7 @@ test_74() {
 run_test 74 "Ensure applications don't fail waiting for OST recovery"
 
 test_80a() {
-    [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
+    [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" && return 0
 
     mkdir -p $DIR/$tdir
     replay_barrier mds2

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index a591d29..c84bb0d 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -248,7 +248,7 @@ test_6a() {
 run_test 6a "touch .../f6a; chmod .../f6a ======================"
 
 test_6b() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
        if [ ! -f $DIR/f6a ]; then
                touch $DIR/f6a
                chmod 0666 $DIR/f6a
@@ -259,7 +259,7 @@ test_6b() {
 run_test 6b "$RUNAS chmod .../f6a (should return error) =="
 
 test_6c() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
        touch $DIR/f6c
        chown $RUNAS_ID $DIR/f6c || error
        $CHECKSTAT -t file -u \#$RUNAS_ID $DIR/f6c || error
@@ -267,7 +267,7 @@ test_6c() {
 run_test 6c "touch .../f6c; chown .../f6c ======================"
 
 test_6d() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
        if [ ! -f $DIR/f6c ]; then
                touch $DIR/f6c
                chown $RUNAS_ID $DIR/f6c
@@ -278,7 +278,7 @@ test_6d() {
 run_test 6d "$RUNAS chown .../f6c (should return error) =="
 
 test_6e() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
        touch $DIR/f6e
        chgrp $RUNAS_ID $DIR/f6e || error
        $CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/f6e || error
@@ -286,7 +286,7 @@ test_6e() {
 run_test 6e "touch .../f6e; chgrp .../f6e ======================"
 
 test_6f() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
        if [ ! -f $DIR/f6e ]; then
                touch $DIR/f6e
                chgrp $RUNAS_ID $DIR/f6e
@@ -297,7 +297,7 @@ test_6f() {
 run_test 6f "$RUNAS chgrp .../f6e (should return error) =="
 
 test_6g() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
         mkdir $DIR/d6g || error
         chmod 777 $DIR/d6g || error
         $RUNAS mkdir $DIR/d6g/d || error
@@ -308,7 +308,7 @@ test_6g() {
 run_test 6g "Is new dir in sgid dir inheriting group?"
 
 test_6h() { # bug 7331
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
        touch $DIR/f6h || error "touch failed"
        chown $RUNAS_ID:$RUNAS_ID $DIR/f6h || error "initial chown failed"
        $RUNAS -G$RUNAS_ID chown $RUNAS_ID:0 $DIR/f6h && error "chown worked"
@@ -515,7 +515,7 @@ test_19b() {
 run_test 19b "ls -l .../f19 (should return error) =============="
 
 test_19c() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
        $RUNAS touch $DIR/f19 && error || true
 }
 run_test 19c "$RUNAS touch .../f19 (should return error) =="
@@ -879,7 +879,7 @@ test_27a() {
 run_test 27a "one stripe file =================================="
 
 test_27c() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
        mkdir -p $DIR/d27
        $SETSTRIPE $DIR/d27/f01 -c 2 || error "lstripe failed"
        [ `$GETSTRIPE $DIR/d27/f01 | grep -A 10 obdidx | wc -l` -eq 4 ] ||
@@ -956,7 +956,7 @@ test_27l() {
 run_test 27l "check setstripe permissions (should return error)"
 
 test_27m() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs -- skipping" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" && return
        if [ $ORIGFREE -gt $MAXFREE ]; then
                skip "$ORIGFREE > $MAXFREE skipping out-of-space test on OST0"
                return
@@ -1032,7 +1032,7 @@ exhaust_all_precreations() {
 }
 
 test_27n() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
        remote_mds_nodsh && skip "remote MDS with nodsh" && return
        remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1047,7 +1047,7 @@ test_27n() {
 run_test 27n "create file with some full OSTs =================="
 
 test_27o() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
        remote_mds_nodsh && skip "remote MDS with nodsh" && return
        remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1064,7 +1064,7 @@ test_27o() {
 run_test 27o "create file with all full OSTs (should error) ===="
 
 test_27p() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
        remote_mds_nodsh && skip "remote MDS with nodsh" && return
        remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1084,7 +1084,7 @@ test_27p() {
 run_test 27p "append to a truncated file with some full OSTs ==="
 
 test_27q() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
        remote_mds_nodsh && skip "remote MDS with nodsh" && return
        remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1105,7 +1105,7 @@ test_27q() {
 run_test 27q "append to truncated file with all OSTs full (should error) ==="
 
 test_27r() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
        remote_mds_nodsh && skip "remote MDS with nodsh" && return
        remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1141,7 +1141,7 @@ test_27t() { # bug 10864
 run_test 27t "check that utils parse path correctly"
 
 test_27u() { # bug 4900
-        [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
+        [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
         remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
 #define OBD_FAIL_MDS_OSC_PRECREATE      0x139
@@ -1160,7 +1160,7 @@ test_27u() { # bug 4900
 run_test 27u "skip object creation on OSC w/o objects =========="
 
 test_27v() { # bug 4900
-       [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return
        remote_mds_nodsh && skip "remote MDS with nodsh" && return
        remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -1195,7 +1195,7 @@ test_27w() { # bug 10997
         size=`$GETSTRIPE $DIR/d27w/f0 -qs`
         [ $size -ne 65536 ] && error "stripe size $size != 65536" || true
 
-        [ "$OSTCOUNT" -lt "2" ] && skip "skipping multiple stripe count/offset test" && return
+        [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping multiple stripe count/offset test" && return
         for i in `seq 1 $OSTCOUNT`; do
                 offset=$(($i-1))
                 $LSTRIPE $DIR/d27w/f$i -c $i -i $offset || error "lstripe -c $i -i $offset failed"
@@ -1208,7 +1208,7 @@ test_27w() { # bug 10997
 run_test 27w "check lfs setstripe -c -s -i options ============="
 
 test_27x() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return
        DELAY=$(do_facet mds lctl get_param -n lov.*.qos_maxage | awk '{print $1 + 2}')
        OFFSET=$(($OSTCOUNTi - 1))
        OSTIDX=0
@@ -1228,7 +1228,7 @@ test_27x() {
 run_test 27x "create files while OST0 is degraded"
 
 test_27y() {
-        [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs -- skipping" && return
+        [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" && return
         remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
         MDS_OSCS=`do_facet mds lctl dl | awk '/[oO][sS][cC].*md[ts]/ { print $4 }'`
@@ -1809,7 +1809,7 @@ test_36d() {
 run_test 36d "non-root OST utime check (open, utime) ==========="
 
 test_36e() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
        mkdir -p $DIR/$tdir
        touch $DIR/$tdir/$tfile
        $RUNAS utime $DIR/$tdir/$tfile && \
@@ -2103,7 +2103,7 @@ test_43c() {
 run_test 43c "md5sum of copy into lustre========================"
 
 test_44() {
-       [  "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+       [  "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
        dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=1023
        dd if=$DIR/f1 bs=4k count=1 > /dev/null
 }
@@ -2416,7 +2416,7 @@ test_51c() {
 run_test 51c "rmdir .../t-0 --- .../t-$NUMTEST ===================="
 
 test_51d() {
-        [  "$OSTCOUNT" -lt "3" ] && skip "skipping test with few OSTs" && return
+        [  "$OSTCOUNT" -lt "3" ] && skip_env "skipping test with few OSTs" && return
         mkdir -p $DIR/d51d
         createmany -o $DIR/d51d/t- 1000
         $LFS getstripe $DIR/d51d > $TMP/files
@@ -2507,8 +2507,8 @@ test_53() {
 run_test 53 "verify that MDS and OSTs agree on pre-creation ===="
 
 test_54a() {
-        [ ! -f "$SOCKETSERVER" ] && skip "no socketserver, skipping" && return
-        [ ! -f "$SOCKETCLIENT" ] && skip "no socketclient, skipping" && return
+        [ ! -f "$SOCKETSERVER" ] && skip_env "no socketserver, skipping" && return
+        [ ! -f "$SOCKETCLIENT" ] && skip_env "no socketclient, skipping" && return
        $SOCKETSERVER $DIR/socket
        $SOCKETCLIENT $DIR/socket || error
        $MUNLINK $DIR/socket
@@ -2590,7 +2590,7 @@ check_fstype() {
 test_55() {
         rm -rf $DIR/d55
         mkdir $DIR/d55
-        check_fstype && skip "can't find fs $FSTYPE" && return
+        check_fstype && skip_env "can't find fs $FSTYPE" && return
         mount -t $FSTYPE -o loop,iopen $EXT2_DEV $DIR/d55 || error "mounting"
         touch $DIR/d55/foo
         $IOPENTEST1 $DIR/d55/foo $DIR/d55 || error "running $IOPENTEST1"
@@ -2640,7 +2640,7 @@ test_56a() {      # was test_56
                 error "lfs getstripe --obd wrong_uuid should return error message"
 
         [  "$OSTCOUNT" -lt 2 ] && \
-                skip "skipping other lfs getstripe --obd test" && return
+                skip_env "skipping other lfs getstripe --obd test" && return
         FILENUM=`$GETSTRIPE --recursive $DIR/d56 | sed -n '/^[  ]*1[    ]/p' | wc -l`
         OBDUUID=`$GETSTRIPE --recursive $DIR/d56 | sed -n '/^[  ]*1:/p' | awk '{print $2}'`
         FOUND=`$GETSTRIPE -r --obd $OBDUUID $DIR/d56 | wc -l`
@@ -2800,7 +2800,7 @@ test_56o() {
 run_test 56o "check lfs find -mtime for old files =========================="
 
 test_56p() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
 
        TDIR=$DIR/${tdir}g
        rm -rf $TDIR
@@ -2823,7 +2823,7 @@ test_56p() {
 run_test 56p "check lfs find -uid and ! -uid ==============================="
 
 test_56q() {
-       [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
 
        TDIR=$DIR/${tdir}g
         rm -rf $TDIR
@@ -2913,7 +2913,7 @@ test_57b() {
 run_test 57b "default LOV EAs are stored inside large inodes ==="
 
 test_58() {
-    [ -z "$(which wiretest 2>/dev/null)" ] && skip "could not find wiretest" && return
+    [ -z "$(which wiretest 2>/dev/null)" ] && skip_env "could not find wiretest" && return
     wiretest
 }
 run_test 58 "verify cross-platform wire constants =============="
@@ -2931,7 +2931,7 @@ run_test 59 "verify cancellation of llog records async ========="
 
 TEST60_HEAD="test_60 run $RANDOM"
 test_60a() {
-        [ ! -f run-llog.sh ] && skip "missing subtest run-llog.sh" && return
+        [ ! -f run-llog.sh ] && skip_env "missing subtest run-llog.sh" && return
        log "$TEST60_HEAD - from kernel mode"
        sh run-llog.sh
 }
@@ -3050,7 +3050,7 @@ test_64a () {
 run_test 64a "verify filter grant calculations (in kernel) ====="
 
 test_64b () {
-        [ ! -f oos.sh ] && skip "missing subtest oos.sh" && return
+        [ ! -f oos.sh ] && skip_env "missing subtest oos.sh" && return
        sh oos.sh $MOUNT
 }
 run_test 64b "check out-of-space detection on client ==========="
@@ -3164,7 +3164,7 @@ test_65j() { # bug6367
 run_test 65j "set default striping on root directory (bug 6367)="
 
 test_65k() { # bug11679
-        [ "$OSTCOUNT" -lt 2 ] && skip "too few OSTs" && return
+        [ "$OSTCOUNT" -lt 2 ] && skip_env "too few OSTs" && return
         remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
         echo "Check OST status: "
@@ -3237,10 +3237,10 @@ swap_used() {
 
 # test case for lloop driver, basic function
 test_68a() {
-       [ "$UID" != 0 ] && skip "must run as root" && return
+       [ "$UID" != 0 ] && skip_env "must run as root" && return
 
        grep -q llite_lloop /proc/modules
-       [ $? -ne 0 ] && skip "can't find module llite_lloop" && return
+       [ $? -ne 0 ] && skip_env "can't find module llite_lloop" && return
 
        LLOOP=$TMP/lloop.`date +%s`.`date +%N`
        dd if=/dev/zero of=$DIR/f68a bs=4k count=1024
@@ -3258,12 +3258,12 @@ run_test 68a "lloop driver - basic test ========================"
 # excercise swapping to lustre by adding a high priority swapfile entry
 # and then consuming memory until it is used.
 test_68b() {  # was test_68
-       [ "$UID" != 0 ] && skip "must run as root" && return
+       [ "$UID" != 0 ] && skip_env "must run as root" && return
        lctl get_param -n devices | grep -q obdfilter && \
                skip "local OST" && return
 
        grep -q llite_lloop /proc/modules
-       [ $? -ne 0 ] && skip "can't find module llite_lloop" && return
+       [ $? -ne 0 ] && skip_env "can't find module llite_lloop" && return
 
        [ -z "`$LCTL list_nids | grep -v tcp`" ] && \
                skip "can't reliably test swap with TCP" && return
@@ -3329,11 +3329,11 @@ run_test 71 "Running dbench on lustre (don't segment fault) ===="
 
 test_72() { # bug 5695 - Test that on 2.6 remove_suid works properly
        check_kernel_version 43 || return 0
-       [ "$RUNAS_ID" = "$UID" ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+       [ "$RUNAS_ID" = "$UID" ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return
 
         # Check that testing environment is properly set up. Skip if not
         FAIL_ON_ERROR=false check_runas_id_ret $RUNAS_ID $RUNAS_ID $RUNAS || {
-                skip "User $RUNAS_ID does not exist - skipping"
+                skip_env "User $RUNAS_ID does not exist - skipping"
                 return 0
         }
        # We had better clear the $DIR to get enough space for dd
@@ -3809,7 +3809,7 @@ test_80() { # bug 10718
 run_test 80 "Page eviction is equally fast at high offsets too  ===="
 
 test_99a() {
-        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && \
+        [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && \
            return
        mkdir -p $DIR/d99cvsroot
        chown $RUNAS_ID $DIR/d99cvsroot
@@ -3822,7 +3822,7 @@ test_99a() {
 run_test 99a "cvs init ========================================="
 
 test_99b() {
-        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
+        [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return
        [ ! -d $DIR/d99cvsroot ] && test_99a
        cd /etc/init.d
        # some versions of cvs import exit(1) when asked to import links or
@@ -3835,7 +3835,7 @@ test_99b() {
 run_test 99b "cvs import ======================================="
 
 test_99c() {
-        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
+        [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return
        [ ! -d $DIR/d99cvsroot ] && test_99b
        cd $DIR
        mkdir -p $DIR/d99reposname
@@ -3845,7 +3845,7 @@ test_99c() {
 run_test 99c "cvs checkout ====================================="
 
 test_99d() {
-        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
+        [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return
        [ ! -d $DIR/d99cvsroot ] && test_99c
        cd $DIR/d99reposname
        $RUNAS touch foo99
@@ -3854,7 +3854,7 @@ test_99d() {
 run_test 99d "cvs add =========================================="
 
 test_99e() {
-        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
+        [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return
        [ ! -d $DIR/d99cvsroot ] && test_99c
        cd $DIR/d99reposname
        $RUNAS cvs update
@@ -3862,7 +3862,7 @@ test_99e() {
 run_test 99e "cvs update ======================================="
 
 test_99f() {
-        [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return
+        [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return
        [ ! -d $DIR/d99cvsroot ] && test_99d
        cd $DIR/d99reposname
        $RUNAS cvs commit -m 'nomsg' foo99
@@ -4002,7 +4002,7 @@ ra_check_101() {
 }
 
 test_101b() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping stride IO stride-ahead test" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping stride IO stride-ahead test" && return
        local STRIPE_SIZE=1048576
        local STRIDE_SIZE=$((STRIPE_SIZE*OSTCOUNT))
        local FILE_LENGTH=$((STRIPE_SIZE*100))
@@ -4117,10 +4117,10 @@ test_102a() {
        rm -f $testfile
         touch $testfile
 
-       [ "$UID" != 0 ] && skip "must run as root" && return
-       [ -z "`lctl get_param -n mdc.*-mdc-*.connect_flags | grep xattr`" ] && skip "must have user_xattr" && return
+       [ "$UID" != 0 ] && skip_env "must run as root" && return
+       [ -z "`lctl get_param -n mdc.*-mdc-*.connect_flags | grep xattr`" ] && skip_env "must have user_xattr" && return
 
-       [ -z "$(which setfattr 2>/dev/null)" ] && skip "could not find setfattr" && return
+       [ -z "$(which setfattr 2>/dev/null)" ] && skip_env "could not find setfattr" && return
 
        echo "set/get xattr..."
         setfattr -n trusted.name1 -v value1 $testfile || error
@@ -4163,7 +4163,7 @@ run_test 102a "user xattr test =================================="
 test_102b() {
        # b10930: get/set/list trusted.lov xattr
        echo "get/set/list trusted.lov xattr ..."
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
        local testfile=$DIR/$tfile
        $SETSTRIPE -s 65536 -i 1 -c 2 $testfile || error "setstripe failed"
        getfattr -d -m "^trusted" $testfile 2> /dev/null | \
@@ -4188,7 +4188,7 @@ run_test 102b "getfattr/setfattr for trusted.lov EAs ============"
 test_102c() {
        # b10930: get/set/list lustre.lov xattr
        echo "get/set/list lustre.lov xattr ..."
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
        mkdir -p $DIR/$tdir
        chown $RUNAS_ID $DIR/$tdir
        local testfile=$DIR/$tdir/$tfile
@@ -4270,8 +4270,8 @@ find_lustre_tar() {
 test_102d() {
        # b10930: tar test for trusted.lov xattr
        TAR=$(find_lustre_tar)
-       [ -z "$TAR" ] && skip "lustre-aware tar is not installed" && return
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping N-stripe test" && return
+       [ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return
        setup_test102
        mkdir -p $DIR/d102d
        $TAR xf $TMP/f102.tar -C $DIR/d102d --xattrs
@@ -4283,8 +4283,8 @@ run_test 102d "tar restore stripe info from tarfile,not keep osts ==========="
 test_102f() {
        # b10930: tar test for trusted.lov xattr
        TAR=$(find_lustre_tar)
-       [ -z "$TAR" ] && skip "lustre-aware tar is not installed" && return
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping N-stripe test" && return
+       [ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return
        setup_test102
        mkdir -p $DIR/d102f
        cd $DIR
@@ -4298,7 +4298,7 @@ test_102h() { # bug 15777
        [ -z $(lctl get_param -n mdc.*.connect_flags | grep xattr) ] &&
                skip "must have user_xattr" && return
        [ -z "$(which setfattr 2>/dev/null)" ] &&
-               skip "could not find setfattr" && return
+               skip_env "could not find setfattr" && return
 
        XBIG=trusted.big
        XSIZE=1024
@@ -4350,8 +4350,8 @@ run_test 102i "lgetxattr test on symbolic link ============"
 
 test_102j() {
        TAR=$(find_lustre_tar)
-       [ -z "$TAR" ] && skip "lustre-aware tar is not installed" && return
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping N-stripe test" && return
+       [ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return
        setup_test102 "$RUNAS"
        mkdir -p $DIR/d102j
        chown $RUNAS_ID $DIR/d102j
@@ -4370,9 +4370,9 @@ run_acl_subtest()
 }
 
 test_103 () {
-    [ "$UID" != 0 ] && skip "must run as root" && return
+    [ "$UID" != 0 ] && skip_env "must run as root" && return
     [ -z "$(lctl get_param -n mdc.*-mdc-*.connect_flags | grep acl)" ] && skip "must have acl enabled" && return
-    [ -z "$(which setfacl 2>/dev/null)" ] && skip "could not find setfacl" && return
+    [ -z "$(which setfacl 2>/dev/null)" ] && skip_env "could not find setfacl" && return
     $GSS && skip "could not run under gss" && return
 
     declare -a identity_old
@@ -4579,7 +4579,7 @@ free_min_max () {
 }
 
 test_116() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return
 
        echo -n "Free space priority "
        lctl get_param -n lov.*-clilov-*.qos_prio_free
@@ -5051,7 +5051,7 @@ run_test 119a "Short directIO read must return actual read amount"
 
 test_119b() # bug 11737
 {
-        [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
+        [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return
 
         $SETSTRIPE -c 2 $DIR/$tfile || error "setstripe failed"
         dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 seek=1 || error "dd failed"
@@ -5580,7 +5580,7 @@ run_test 125 "don't return EPROTO when a dir has a non-default striping and ACLs
 
 test_126() { # bug 12829/13455
        [ -z "$(lctl get_param -n llite.*.client_type | grep local)" ] && skip "must run as local client" && return
-       [ "$UID" != 0 ] && echo "skipping $TESTNAME (must run as root)" && return
+       [ "$UID" != 0 ] && skip_env "skipping $TESTNAME (must run as root)" && return
        $GSS && skip "must run as gss disabled" && return
 
        $RUNAS -u 0 -g 1 touch $DIR/$tfile || error "touch failed"
@@ -5737,7 +5737,7 @@ test_130a() {
 run_test 130a "FIEMAP (1-stripe file)"
 
 test_130b() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping FIEMAP on 2-stripe file test" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping FIEMAP on 2-stripe file test" && return
 
        filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
        [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
@@ -5786,7 +5786,7 @@ test_130b() {
 run_test 130b "FIEMAP (2-stripe file)"
 
 test_130c() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping FIEMAP on 2-stripe file with hole test" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping FIEMAP on 2-stripe file with hole test" && return
 
        filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
        [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
@@ -5841,7 +5841,7 @@ test_130c() {
 run_test 130c "FIEMAP (2-stripe file with hole)"
 
 test_130d() {
-       [ "$OSTCOUNT" -lt "3" ] && skip "skipping FIEMAP on N-stripe file test" && return
+       [ "$OSTCOUNT" -lt "3" ] && skip_env "skipping FIEMAP on N-stripe file test" && return
 
        filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
        [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
@@ -5890,7 +5890,7 @@ test_130d() {
 run_test 130d "FIEMAP (N-stripe file)"
 
 test_130e() {
-       [ "$OSTCOUNT" -lt "2" ] && skip "skipping continuation FIEMAP test" && return
+       [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping continuation FIEMAP test" && return
 
        filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
        [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return