From: grev <grev>
Date: Wed, 16 Jul 2008 18:21:27 +0000 (+0000)
Subject: b=15745
X-Git-Tag: v1_9_50~194
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=fdd76f93af252805c71ddf9aef2f6ea9e21a70dc;p=fs%2Flustre-release.git

b=15745
i=Adilger
avoid rm -fr failure caused by nfs slowness
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index f8edc68..78fb3da 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1198,7 +1198,7 @@ test_32a() {
 	start mds $tmpdir/mds "-o loop,exclude=lustre-OST0000" || return 12
 	cleanup_nocli
 
-	[ -d $tmpdir ] && rm -rf $tmpdir
+	rm -rf $tmpdir || true	# true is only for TMP on NFS
 }
 run_test 32a "Upgrade from 1.4 (not live)"
 
@@ -1256,7 +1256,7 @@ test_32b() {
 	echo "ok."
 
 	cleanup
-	[ -d $tmpdir ] && rm -rf $tmpdir
+	rm -rf $tmpdir || true  # true is only for TMP on NFS
 }
 run_test 32b "Upgrade from 1.4 with writeconf"