From patchwork Mon Feb 6 09:57:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keng-Yu Lin X-Patchwork-Id: 139702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id D2729B7205 for ; Mon, 6 Feb 2012 20:57:39 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RuLKM-0003yJ-NJ for incoming@patchwork.ozlabs.org; Mon, 06 Feb 2012 09:57:38 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RuLKL-0003xp-7k for fwts-devel@lists.ubuntu.com; Mon, 06 Feb 2012 09:57:37 +0000 Received: from 218-168-61-160.dynamic.hinet.net ([218.168.61.160] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RuLKK-0008VT-7q; Mon, 06 Feb 2012 09:57:37 +0000 From: Keng-Yu Lin To: fwts-devel@lists.ubuntu.com Subject: [fwts-test] remove log line numbers before diff Date: Mon, 6 Feb 2012 17:57:29 +0800 Message-Id: <1328522249-21588-1-git-send-email-kengyu@canonical.com> X-Mailer: git-send-email 1.7.8.3 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com Signed-off-by: Keng-Yu Lin Acked-by: Colin King --- dmesg_common-0001/test-0002.sh | 4 ++-- klog-0001/test-0002.sh | 4 ++-- oops-0001/test-0002.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dmesg_common-0001/test-0002.sh b/dmesg_common-0001/test-0002.sh index 97c2638..b32245c 100755 --- a/dmesg_common-0001/test-0002.sh +++ b/dmesg_common-0001/test-0002.sh @@ -4,8 +4,8 @@ TEST="Test dmesg_common summary table against known failure patterns" NAME=test-0002.sh TMPLOG=$TMP/dmesg_common.log.$$ -$FWTS -w 80 --klog=dmesg_common.txt dmesg_common - | grep summary| cut -c7- > $TMPLOG -diff $TMPLOG dmesg_common-0002.log >> $FAILURE_LOG +$FWTS -w 80 --klog=dmesg_common.txt dmesg_common - | grep summary | grep -v "log line:" | cut -c7- > $TMPLOG +grep -v "log line:" dmesg_common-0002.log | diff $TMPLOG - >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then echo PASSED: $TEST, $NAME diff --git a/klog-0001/test-0002.sh b/klog-0001/test-0002.sh index bc6279f..ff111c1 100755 --- a/klog-0001/test-0002.sh +++ b/klog-0001/test-0002.sh @@ -4,8 +4,8 @@ TEST="Test klog summary table against known failure patterns" NAME=test-0002.sh TMPLOG=$TMP/klog.log.$$ -$FWTS -w 80 --klog=klog.txt klog - | grep summary | cut -c7- > $TMPLOG -diff $TMPLOG klog-0002.log >> $FAILURE_LOG +$FWTS -w 80 --klog=klog.txt klog - | grep summary | grep -v "log line:" | cut -c7- > $TMPLOG +grep -v "log line:" klog-0002.log | diff $TMPLOG - >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then echo PASSED: $TEST, $NAME diff --git a/oops-0001/test-0002.sh b/oops-0001/test-0002.sh index 248ed24..eb43148 100755 --- a/oops-0001/test-0002.sh +++ b/oops-0001/test-0002.sh @@ -4,8 +4,8 @@ TEST="Test oops summary table against known failure patterns" NAME=test-0002.sh TMPLOG=$TMP/oops.log.$$ -$FWTS -w 80 --klog=oops.txt oops - | grep summary | cut -c7- > $TMPLOG -diff $TMPLOG oops-0002.log >> $FAILURE_LOG +$FWTS -w 80 --klog=oops.txt oops - | grep summary | grep -v "log line:" | cut -c7- > $TMPLOG +grep -v "log line:" oops-0002.log | diff $TMPLOG - >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then echo PASSED: $TEST, $NAME