X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flarge-lun.sh;h=b184fadb2d93da6ce3d94c80cd3bd538bcecbbca;hb=e2226ae35978f223bf851dabf15eb6b606da8020;hp=fc640e30068ec903ee84ec211923de6ff5b90c51;hpb=75b426f9f9d3f21e08cd1e62b7fa4962a2b8c679;p=fs%2Flustre-release.git

diff --git a/lustre/tests/large-lun.sh b/lustre/tests/large-lun.sh
index fc640e3..b184fad 100644
--- 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
@@ -150,7 +149,7 @@ trap cleanupall EXIT
 
 test_1 () {
 	[ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
-		skip "ldiskfs only test" && return
+		skip_env "ldiskfs only test"
 	local dev
 	for num in $(seq $OSTCOUNT); do
 		dev=$(ostdevname $num)
@@ -240,10 +239,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