From: nathan <nathan>
Date: Thu, 8 Nov 2007 23:10:38 +0000 (+0000)
Subject: b=13709
X-Git-Tag: v1_7_0_51~519
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=4b5b968c0a43be04d0a04d38f65fc64f17a441a0;p=fs%2Flustre-release.git

b=13709
skipping test 22 means we don't reformat after test 21c
---

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 16c6c3b..4e0443c 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -1,4 +1,4 @@
-FSNAME=lustre
+FSNAME=${FSNAME:-lustre}
 
 # facet hosts
 mds_HOST=${mds_HOST:-`hostname`}
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 8626370..fc84441 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -762,12 +762,12 @@ test_21c() {
 	stop_ost
 	stop_ost2
 	stop_mds
+        #reformat to remove ost2 from logs
+        reformat
 }
 run_test 21c "start mds between two osts, stop mds last"
 
 test_22() {
-        #reformat to remove all logs
-        reformat
 	start_mds
 	echo Client mount before any osts are in the logs
 	mount_client $MOUNT