From ef50ce8496e4ead67c795c9db11fa9c0d58ef844 Mon Sep 17 00:00:00 2001
From: Chennaiah Palla <chennaiah.palla@seagate.com>
Date: Tue, 20 Oct 2015 11:28:21 +0530
Subject: [PATCH] LU-7301 test: do cleanup only if required

change check_and_cleanup_lustre() to do cleanup only if required

Seagate-bug-id: MRP-1257
Signed-off-by: Chennaiah Palla <chennaiah.palla@seagate.com>
Change-Id: I22f3b2a448c78b0468c5d802a370a51aab3c9f8d
Reviewed-on: http://review.whamcloud.com/16887
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
---
 lustre/tests/test-framework.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 352cd3f..732eaff 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -142,6 +142,7 @@ init_test_env() {
 	export TEST_FAILED=false
 	export FAIL_ON_SKIP_ENV=${FAIL_ON_SKIP_ENV:-false}
 	export RPC_MODE=${RPC_MODE:-false}
+	export DO_CLEANUP=${DO_CLEANUP:-true}
 
     export MKE2FS=$MKE2FS
     if [ -z "$MKE2FS" ]; then
@@ -4307,8 +4308,12 @@ check_and_cleanup_lustre() {
 	fi
 
 	if is_mounted $MOUNT; then
-		[ -n "$DIR" ] && rm -rf $DIR/[Rdfs][0-9]* ||
-			error "remove sub-test dirs failed"
+		if $DO_CLEANUP; then
+			[ -n "$DIR" ] && rm -rf $DIR/[Rdfs][0-9]* ||
+				error "remove sub-test dirs failed"
+		else
+			echo "skip cleanup"
+		fi
 		[ "$ENABLE_QUOTA" ] && restore_quota || true
 	fi
 
-- 
1.8.3.1