From b2ce2621959b4168fb6e6d8623cc065e7cec6f46 Mon Sep 17 00:00:00 2001
From: tianzy <tianzy>
Date: Mon, 1 Dec 2008 03:52:18 +0000
Subject: [PATCH] Branch b1_8_gate fix an error in the test_18b of
 sanity-quota.sh b=17832 i=tianzy

---
 lustre/tests/sanity-quota.sh | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index b18ebc8..b803240 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -1546,20 +1546,15 @@ test_18b() {
 	test_18bc_sub normal
 	test_18bc_sub directio
 	# check if watchdog is triggered
-	MSG="test 18b: run for fixing bug14840"
-	do_facet ost1 "dmesg > $TMP/lustre-log-${TESTNAME}.log"
-	do_facet client cat > $TMP/lustre-log-${TESTNAME}.awk <<-EOF
-		/$MSG/ {
-		    start = 1;
-		}
-		/Watchdog triggered/ {
-		    if (start) {
-		        print \$0;
-		    }
-		}
-	EOF
-	watchdog=`do_facet ost1 awk -f $TMP/lustre-log-${TESTNAME}.awk $TMP/lustre-log-${TESTNAME}.log`
+	do_facet ost1 dmesg > $TMP/lustre-log-${TESTNAME}.log
+	watchdog=`awk '/test 18b/ {start = 1;}
+	               /Watchdog triggered/ {
+			       if (start) {
+				       print;
+			       }
+		       }' $TMP/lustre-log-${TESTNAME}.log`
 	if [ -n "$watchdog" ]; then error "$watchdog"; fi
+	rm -f $TMP/lustre-log-${TESTNAME}.log
 }
 run_test_with_stat 18b "run for fixing bug14840(mds failover, no watchdog) ==========="
 
-- 
1.8.3.1