From: grev <grev>
Date: Fri, 7 Nov 2008 17:17:12 +0000 (+0000)
Subject: b=17477
X-Git-Tag: v1_7_140~1^146~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=93e72e1e7334c4d5bf4964ba2134a3c673d7b569;p=fs%2Flustre-release.git

b=17477
i=Adilger
check config if lustre is mounted before acc-sm run
---

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index d21237b..490bb76 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -50,8 +50,20 @@ FORMAT=${FORMAT:-formatall}
 CLEANUP=${CLEANUP:-stopall}
 
 setup_if_needed() {
-    mount | grep $MOUNT && return
+    local MOUNTED=$(mounted_lustre_filesystems)
+    if $(echo $MOUNTED | grep -w -q $MOUNT); then
+        check_config $MOUNT
+        return
+    fi
+
+    echo "Lustre is not mounted, trying to do setup SETUP=$SETUP ... "
     $FORMAT && $SETUP
+
+    MOUNTED=$(mounted_lustre_filesystems)
+    if ! $(echo $MOUNTED | grep -w -q $MOUNT); then
+        echo "Lustre is not mounted after setup! SETUP=$SETUP"
+        exit 1
+    fi
 }
 
 title() {
@@ -272,7 +284,7 @@ for NAME in $CONFIGS; do
 		mount_client $MOUNT2
 		#echo "can't mount2 for '$NAME', skipping sanityN.sh"
 		START=: CLEAN=: bash sanityN.sh
-		umount $MOUNT2
+		[ "$(mount | grep $MOUNT2)" ] && umount $MOUNT2
 
 		$DEBUG_ON
 		$CLEANUP