From: nathan <nathan>
Date: Fri, 23 Jun 2006 19:41:48 +0000 (+0000)
Subject: Branch b1_5
X-Git-Tag: v1_7_100~1^90~8^2~68
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1f3e51b11d37aa6e5775b8ebc7a5a71f7f4d3ea7;p=fs%2Flustre-release.git

Branch b1_5
b=9858
more test fixes for b1_5
---

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index c94a564..8a05713 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -571,7 +571,7 @@ test_24() {
 	lfs df $DIR1/$tfile || error "lfs df $DIR1/$tfile failed"
 	lfs df -ih $DIR2/$tfile || error "lfs df -ih $DIR2/$tfile failed"
 	
-	OSC=`lctl dl | awk '/OSC.*MNT/ {print $4}' | head -n 1`
+	OSC=`lctl dl | awk '/-osc-/ {print $4}' | head -n 1`
 	lctl --device %$OSC deactivate
 	lfs df -i || error "lfs df -i with deactivated OSC failed"
 	lctl --device %$OSC recover
@@ -580,7 +580,7 @@ test_24() {
 run_test 24 "lfs df [-ih] [path] test ========================="
 
 test_25() {
-	[ `cat $LPROC/mdc/MDC*MNT*/connect_flags | grep -c acl` -lt 2 ] && echo "skipping $TESTNAME (must have acl)" && return
+	[ `cat $LPROC/mdc/*-mdc-*/connect_flags | grep -c acl` -lt 2 ] && echo "skipping $TESTNAME (must have acl)" && return
 
 	mkdir $DIR1/d25 || error
 	touch $DIR1/d25/f1 || error