From 30ee3e40687c211ffe30b39070068868886a3261 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Sat, 24 Dec 2005 20:07:28 +0000
Subject: [PATCH] Branch b_release_1_4_6 Fix up acl check.

---
 lustre/tests/sanity.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index de17cc2..e2e0207 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -115,7 +115,7 @@ run_one() {
 	export TESTNAME=test_$1
 	export tfile=f${testnum}
 	export tdir=d${base}
-	test_$1 || error "exit with rc=$?"
+	test_$1 || error "test_$1: exit with rc=$?"
 	unset TESTNAME
 	pass "($((`date +%s` - $BEFORE))s)"
 	cd $SAVE_PWD
@@ -2846,7 +2846,7 @@ test_103 () {
 
     [ "$UID" != 0 ] && echo "skipping $TESTNAME (must run as root)" && return
     [ -z "`mount | grep " $DIR .*\<acl\>"`" ] && echo "skipping $TESTNAME (must have acl)" && return
-    [ -z "grep \<acl\> /proc/fs/lustre/osc/OSC*MNT*/connect_flags" ] && echo "skipping $TESTNAME (must have acl)" && return
+    [ -z "`grep acl /proc/fs/lustre/mdc/MDC*MNT*/connect_flags`" ] && echo "skipping $TESTNAME (must have acl)" && return
 
     echo "performing cp ..."
     run_acl_subtest cp || error
-- 
1.8.3.1