From patchwork Wed May 16 13:20:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 159649 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 55D6AB6FFC for ; Wed, 16 May 2012 23:21:09 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SUeA7-0003Ps-VQ for incoming@patchwork.ozlabs.org; Wed, 16 May 2012 13:21:08 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SUeA6-0003P4-CG for fwts-devel@lists.ubuntu.com; Wed, 16 May 2012 13:21:06 +0000 Received: from cpc19-craw6-2-0-cust5.croy.cable.virginmedia.com ([77.102.228.6] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SUeA6-0007X5-9r for fwts-devel@lists.ubuntu.com; Wed, 16 May 2012 13:21:06 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 09/27] acpitables-0007: fix tests to work with new fwts logging Date: Wed, 16 May 2012 14:20:40 +0100 Message-Id: <1337174459-21597-10-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1337174459-21597-1-git-send-email-colin.king@canonical.com> References: <1337174459-21597-1-git-send-email-colin.king@canonical.com> 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 From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu --- acpitables-0007/acpitables-0001.log | 6 +++--- acpitables-0007/test-0001.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/acpitables-0007/acpitables-0001.log b/acpitables-0007/acpitables-0001.log index 9001c4c..539e50e 100644 --- a/acpitables-0007/acpitables-0001.log +++ b/acpitables-0007/acpitables-0001.log @@ -1,5 +1,5 @@ acpitables ACPI table settings sanity checks. -acpitables --------------------------------------------------------- +acpitables ---------------------------------------------------------- acpitables Test 1 of 1: Check ACPI tables. acpitables Table APIC not present to check. acpitables Table ECDT not present to check. @@ -122,7 +122,7 @@ acpitables this will cause the kernel to oops, at best the kernel may acpitables ignore this. However, it should be fixed where possible. acpitables acpitables -acpitables ========================================================= +acpitables ========================================================== acpitables 2 passed, 14 failed, 0 warnings, 0 aborted, 0 skipped, 0 acpitables info only. -acpitables ========================================================= +acpitables ========================================================== diff --git a/acpitables-0007/test-0001.sh b/acpitables-0007/test-0001.sh index 5bdc106..770a8d3 100755 --- a/acpitables-0007/test-0001.sh +++ b/acpitables-0007/test-0001.sh @@ -4,7 +4,7 @@ TEST="Test apcitables against broken ACPI XSDT table" NAME=test-0001.sh TMPLOG=$TMP/acpitables.log.$$ -$FWTS -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG diff $TMPLOG acpitables-0001.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then