From: grev <grev>
Date: Wed, 16 Jul 2008 18:32:24 +0000 (+0000)
Subject: b=15745
X-Git-Tag: v1_7_0_51~2^86~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8c131889774c32b59f4e61e9f77e791c6445fdf9;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 fda47a4..bf500c5 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1209,7 +1209,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)"
 
@@ -1267,7 +1267,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"