From 48bfb0da627d79f527fc230a0a0fd0d4bc99ad2a Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Wed, 16 Jan 2008 02:15:34 +0000
Subject: [PATCH] Branch HEAD b=14626 i=adilger o=johann

fix sanity test_60b() script.
---
 lustre/tests/sanity.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index a20bcd6..596c955 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2664,8 +2664,19 @@ run_test 60a "llog sanity tests run from kernel module =========="
 
 test_60b() { # bug 6411
 	dmesg > $DIR/$tfile
-	LLOG_COUNT=`dmesg | grep -A 1000 "$TEST60_HEAD" | grep -c llog_test`
-	[ $LLOG_COUNT -gt 50 ] && error "CDEBUG_LIMIT not limiting messages"|| true
+	LLOG_COUNT=`dmesg | awk "/$TEST60_HEAD/{marker = 1; from_marker = 0;}
+				 /llog-test/ {
+					 if (marker)
+						 from_marker++
+					 from_begin++
+				 }
+				 END {
+					 if (marker)
+						 print from_marker
+					 else
+						 print from_begin
+				 }"`
+	[ $LLOG_COUNT -gt 50 ] && error "CDEBUG_LIMIT not limiting messages ($LLOG_COUNT)"|| true
 }
 run_test 60b "limit repeated messages from CERROR/CWARN ========"
  
-- 
1.8.3.1