From: tianzy <tianzy>
Date: Fri, 13 Apr 2007 02:42:12 +0000 (+0000)
Subject: corrected an error made in setepall in test-framework.sh, which affects
X-Git-Tag: v1_7_100~189
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=44711ce0e1c6de1bb016d4d39e1054efb0223568

corrected an error made in setepall in test-framework.sh, which affects
other tests run. For example runtest.sh, replay-single.sh
---

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 1f2ca61..dd1dc88 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -155,25 +155,25 @@ mounted_lustre_filesystems() {
 
 # Remember where our caller has hinted that we should mount lustre
 MOUNT_HINT=$MOUNT
-MOUNT_HINT2=$MOUNT2
+MOUNT_HINT2=$MOUNT_2
 MOUNT="`mounted_lustre_filesystems 1`"
-MOUNT2="`mounted_lustre_filesystems 2`"
+MOUNT_2="`mounted_lustre_filesystems 2`"
 if [ $TEST_9_10 -eq 1 -a "$MOUNT" ]; then
         echo "test9 and test10 will run on $MOUNT"
-elif [ "$MOUNT" -a "$MOUNT2" ]; then
-	echo "testing on $MOUNT and $MOUNT2"
-elif [ "$MOUNT" -o "$MOUNT2" ]; then
-        error "test needs two mounts, only found $MOUNT $MOUNT2!"
+elif [ "$MOUNT" -a "$MOUNT_2" ]; then
+	echo "testing on $MOUNT and $MOUNT_2"
+elif [ "$MOUNT" -o "$MOUNT_2" ]; then
+        error "test needs two mounts, only found $MOUNT $MOUNT_2!"
 else
 	export QUOTA_OPTS="quotaon=ug"
 	export MOUNT=$MOUNT_HINT 
-	export MOUNT2=$MOUNT_HINT2
-	MOUNT2=${MOUNT2:-/mnt/lustre2}
+	export MOUNT_2=$MOUNT_HINT2
+	MOUNT_2=${MOUNT_2:-/mnt/lustre_2}
 	sh llmount.sh 
 	MOUNT="`mounted_lustre_filesystems 1`"
-	MOUNT2="`mounted_lustre_filesystems 2`"
+	MOUNT_2="`mounted_lustre_filesystems 2`"
 	[ -z "$MOUNT" ] && error "NAME=$MOUNT not mounted"
-	[ -z "$MOUNT2" ] && error "NAME=$MOUNT2 not mounted"
+	[ -z "$MOUNT_2" ] && error "NAME=$MOUNT_2 not mounted"
 	I_MOUNTED=yes
 fi
 
@@ -181,7 +181,7 @@ fi
 
 DIR=${DIR:-$MOUNT}
 [ -z "`echo $DIR | grep $MOUNT`" ] && echo "$DIR not in $MOUNT" && exit 99
-DIR2=${DIR2:-$MOUNT2}
+DIR2=${DIR2:-$MOUNT_2}
 
 LPROC=/proc/fs/lustre
 LOVNAME=`cat $LPROC/llite/*/lov/common_name | tail -n 1`
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 11d1a9b..2d9a6ee 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -635,7 +635,7 @@ setupall() {
     done
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
     mount_client $MOUNT
-    if [ "$MOUNT2" ]; then
+    if [ "$MOUNT_2" ]; then
 	mount_client $MOUNT2
     fi
     sleep 5