LU-11607 tests: replace lustre_version/fstype - large-lun

[fs/lustre-release.git] / lustre / tests / large-lun.sh

diff --git a/lustre/tests/large-lun.sh b/lustre/tests/large-lun.sh
index fc640e3..5f3f80b 100644 (file)
--- a/lustre/tests/large-lun.sh
+++ b/lustre/tests/large-lun.sh
@@ -14,7 +14,6 @@ init_logging
 if [ "$REFORMAT" != "yes" ]; then
        skip_env "$0 reformats all devices,\
                please set REFORMAT to run this test"
-       exit 0
 fi
 
 # Variable to run mdsrate
@@ -83,7 +82,7 @@ client_df() {
 cleanup_dirs() {
        local target=$1
        local mnt=${2:-$MOUNT}
-       local cmd="rm -rf $mnt/{*.filecount,dir*}"
+       local cmd="rm -rf $mnt/{llverfs,dir}*"
        do_facet $target "$cmd"
 }
 
@@ -149,9 +148,10 @@ do_fsck() {
 trap cleanupall EXIT
 
 test_1 () {
-       [ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
-               skip "ldiskfs only test" && return
+       [ "$mds1_FSTYPE" != ldiskfs ] && skip_env "ldiskfs only test"
+
        local dev
+
        for num in $(seq $OSTCOUNT); do
                dev=$(ostdevname $num)
                log "run llverdev on the OST $dev"
@@ -240,10 +240,10 @@ test_2 () {
 run_test 2 "run llverfs on OST ldiskfs/zfs filesystem"
 
 test_3 () {
-       [ -z "$CLIENTS" ] && skip_env "CLIENTS not defined, skipping" && return
-       [ -z "$MPIRUN" ] && skip_env "MIPRUN not defined, skipping" && return
-       [ -z "$MDSRATE" ] && skip_env "MDSRATE not defined, skipping" && return
-       [ ! -x $MDSRATE ] && skip_env "$MDSRATE not built, skipping" && return
+       [ -z "$CLIENTS" ] && skip_env "CLIENTS not defined, skipping"
+       [ -z "$MPIRUN" ] && skip_env "MIPRUN not defined, skipping"
+       [ -z "$MDSRATE" ] && skip_env "MDSRATE not defined, skipping"
+       [ ! -x $MDSRATE ] && skip_env "$MDSRATE not built, skipping"
        # Setup the Lustre filesystem.
        log "setup the lustre filesystem"
        REFORMAT="yes" check_and_setup_lustre