From patchwork Wed May 16 13:20:50 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: 159663 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 A2CB1B6FB4 for ; Wed, 16 May 2012 23:21:23 +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 1SUeAM-0003Vj-Be for incoming@patchwork.ozlabs.org; Wed, 16 May 2012 13:21:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SUeAF-0003Ts-Ro for fwts-devel@lists.ubuntu.com; Wed, 16 May 2012 13:21:15 +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 1SUeAF-0007Xc-Lt for fwts-devel@lists.ubuntu.com; Wed, 16 May 2012 13:21:15 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 19/27] wmi-0001: fix tests to work with new fwts logging Date: Wed, 16 May 2012 14:20:50 +0100 Message-Id: <1337174459-21597-20-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 --- wmi-0001/test-0001.sh | 2 +- wmi-0001/test-0002.sh | 2 +- wmi-0001/test-0003.sh | 2 +- wmi-0001/wmi-0001.log | 6 +++--- wmi-0001/wmi-0002.log | 6 +++--- wmi-0001/wmi-0003.log | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wmi-0001/test-0001.sh b/wmi-0001/test-0001.sh index 52b4ad7..10e97da 100755 --- a/wmi-0001/test-0001.sh +++ b/wmi-0001/test-0001.sh @@ -4,7 +4,7 @@ TEST="Test wmi against known correct ACPI tables" NAME=test-0001.sh TMPLOG=$TMP/wmi.log.$$ -$FWTS -w 80 --dumpfile=acpidump-0001.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG diff $TMPLOG wmi-0001.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then diff --git a/wmi-0001/test-0002.sh b/wmi-0001/test-0002.sh index b06dc0c..ec1dbcf 100755 --- a/wmi-0001/test-0002.sh +++ b/wmi-0001/test-0002.sh @@ -4,7 +4,7 @@ TEST="Test wmi against known correct ACPI tables" NAME=test-0002.sh TMPLOG=$TMP/wmi.log.$$ -$FWTS -w 80 --dumpfile=acpidump-0002.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0002.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG diff $TMPLOG wmi-0002.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then diff --git a/wmi-0001/test-0003.sh b/wmi-0001/test-0003.sh index 295c024..8ca1b90 100755 --- a/wmi-0001/test-0003.sh +++ b/wmi-0001/test-0003.sh @@ -4,7 +4,7 @@ TEST="Test wmi against known incorrect ACPI tables" NAME=test-0003.sh TMPLOG=$TMP/wmi.log.$$ -$FWTS -w 80 --dumpfile=acpidump-0003.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0003.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG diff $TMPLOG wmi-0003.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then diff --git a/wmi-0001/wmi-0001.log b/wmi-0001/wmi-0001.log index 6f871fe..abc73e4 100644 --- a/wmi-0001/wmi-0001.log +++ b/wmi-0001/wmi-0001.log @@ -1,6 +1,6 @@ wmi Extract and analyse Windows Management Instrumentation wmi (WMI). -wmi --------------------------------------------------------- +wmi ---------------------------------------------------------- wmi Test 1 of 2: Check Windows Management Instrumentation in wmi DSDT wmi Found WMI Object, Object ID AC, GUID: @@ -16,7 +16,7 @@ wmi wmi Test 2 of 2: Check Windows Management Instrumentation in wmi SSDT wmi -wmi ========================================================= +wmi ========================================================== wmi 0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 2 wmi info only. -wmi ========================================================= +wmi ========================================================== diff --git a/wmi-0001/wmi-0002.log b/wmi-0001/wmi-0002.log index 1039204..49a2aeb 100644 --- a/wmi-0001/wmi-0002.log +++ b/wmi-0001/wmi-0002.log @@ -1,6 +1,6 @@ wmi Extract and analyse Windows Management Instrumentation wmi (WMI). -wmi --------------------------------------------------------- +wmi ---------------------------------------------------------- wmi Test 1 of 2: Check Windows Management Instrumentation in wmi DSDT wmi Found WMI Object, Object ID AA, GUID: @@ -22,7 +22,7 @@ wmi wmi Test 2 of 2: Check Windows Management Instrumentation in wmi SSDT wmi -wmi ========================================================= +wmi ========================================================== wmi 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 1 wmi info only. -wmi ========================================================= +wmi ========================================================== diff --git a/wmi-0001/wmi-0003.log b/wmi-0001/wmi-0003.log index a9ff064..2414c6a 100644 --- a/wmi-0001/wmi-0003.log +++ b/wmi-0001/wmi-0003.log @@ -1,6 +1,6 @@ wmi Extract and analyse Windows Management Instrumentation wmi (WMI). -wmi --------------------------------------------------------- +wmi ---------------------------------------------------------- wmi Test 1 of 2: Check Windows Management Instrumentation in wmi DSDT wmi Found WMI Object, Object ID AA, GUID: @@ -34,7 +34,7 @@ wmi wmi Test 2 of 2: Check Windows Management Instrumentation in wmi SSDT wmi -wmi ========================================================= +wmi ========================================================== wmi 0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 1 wmi info only. -wmi ========================================================= +wmi ==========================================================