From patchwork Wed May 16 13:20:35 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: 159648 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 0F559B6FAC 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-0003Pi-Nk for incoming@patchwork.ozlabs.org; Wed, 16 May 2012 13:21:07 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SUeA3-0003MX-9F for fwts-devel@lists.ubuntu.com; Wed, 16 May 2012 13:21:03 +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 1SUeA3-0007WK-4M for fwts-devel@lists.ubuntu.com; Wed, 16 May 2012 13:21:03 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 04/27] acpitables-0002: fix tests to work with new fwts logging Date: Wed, 16 May 2012 14:20:35 +0100 Message-Id: <1337174459-21597-5-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-0002/acpitables-0001.log | 6 +++--- acpitables-0002/acpitables-0002.log | 6 +++--- acpitables-0002/test-0001.sh | 2 +- acpitables-0002/test-0002.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/acpitables-0002/acpitables-0001.log b/acpitables-0002/acpitables-0001.log index 90ca6b9..592e9eb 100644 --- a/acpitables-0002/acpitables-0001.log +++ b/acpitables-0002/acpitables-0001.log @@ -1,5 +1,5 @@ acpitables ACPI table settings sanity checks. -acpitables --------------------------------------------------------- +acpitables ---------------------------------------------------------- acpitables Test 1 of 1: Check ACPI tables. acpitables PASSED: Test 1, Table APIC passed. acpitables Table ECDT not present to check. @@ -11,7 +11,7 @@ acpitables PASSED: Test 1, Table RSDP passed. acpitables Table SBST not present to check. acpitables PASSED: Test 1, Table XSDT passed. acpitables -acpitables ========================================================= +acpitables ========================================================== acpitables 4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 acpitables info only. -acpitables ========================================================= +acpitables ========================================================== diff --git a/acpitables-0002/acpitables-0002.log b/acpitables-0002/acpitables-0002.log index 90ca6b9..592e9eb 100644 --- a/acpitables-0002/acpitables-0002.log +++ b/acpitables-0002/acpitables-0002.log @@ -1,5 +1,5 @@ acpitables ACPI table settings sanity checks. -acpitables --------------------------------------------------------- +acpitables ---------------------------------------------------------- acpitables Test 1 of 1: Check ACPI tables. acpitables PASSED: Test 1, Table APIC passed. acpitables Table ECDT not present to check. @@ -11,7 +11,7 @@ acpitables PASSED: Test 1, Table RSDP passed. acpitables Table SBST not present to check. acpitables PASSED: Test 1, Table XSDT passed. acpitables -acpitables ========================================================= +acpitables ========================================================== acpitables 4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 acpitables info only. -acpitables ========================================================= +acpitables ========================================================== diff --git a/acpitables-0002/test-0001.sh b/acpitables-0002/test-0001.sh index 40232fe..9081182 100755 --- a/acpitables-0002/test-0001.sh +++ b/acpitables-0002/test-0001.sh @@ -4,7 +4,7 @@ TEST="Test apcitables against known correct ACPI APIC tables" 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 diff --git a/acpitables-0002/test-0002.sh b/acpitables-0002/test-0002.sh index 3d66343..4162a05 100755 --- a/acpitables-0002/test-0002.sh +++ b/acpitables-0002/test-0002.sh @@ -4,7 +4,7 @@ TEST="Test apcitables against incorrect ACPI APIC tables" NAME=test-0002.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