[PATCH 26/27] method-0001: fix tests to work with new fwts logging

[Colin King]

From: Colin Ian King <colin.king at canonical.com>

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 method-0001/method-0001.log |   37 +++++++++++++++++++++++++++++--------
 method-0001/test-0001.sh    |    4 ++--
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/method-0001/method-0001.log b/method-0001/method-0001.log
index a017762..57a9384 100644
--- a/method-0001/method-0001.log
+++ b/method-0001/method-0001.log
@@ -1,5 +1,6 @@
 method          ACPI DSDT Method Semantic Tests.
-method          ---------------------------------------------------------
+method          ----------------------------------------------------------
+method          Failed to install global event handler.
 method          Test 1 of 93: Check Method Names.
 method          Found 1061 Objects 
 method          PASSED: Test 1, Method names contain legal characters.
@@ -135,11 +136,31 @@ method          SKIPPED: Test 26, Skipping test for non-existant object
 method          _FST.
 method          
 method          Test 27 of 93: Check _ACx (Active Cooling).
-method          SKIPPED: Test 27, Skipping test for non-existant object
-method          AC0.
+method          FAILED [MEDIUM] MethodBadTemp: Test 27, AC0 returned a
+method          dubious value below 0 degrees C: 0x00000000 ( 0.0 degrees
+method          K)
 method          
-method          SKIPPED: Test 27, Skipping test for non-existant object
-method          AC1.
+method          ADVICE: An incorrect value could be because the method
+method          requires interaction with I/O ports or the embedded
+method          controller and this test frame work is spoofing these
+method          operations. However, it is worth sanity checking these
+method          values in /sys/class/thermal/thermal_zone*.
+method          
+method          PASSED: Test 27, \_SB_.PCI0.LPCB.EC0_.BAC0 correctly
+method          acquired and released locks 6 times.
+method          
+method          FAILED [MEDIUM] MethodBadTemp: Test 27, AC1 returned a
+method          dubious value below 0 degrees C: 0x00000000 ( 0.0 degrees
+method          K)
+method          
+method          ADVICE: An incorrect value could be because the method
+method          requires interaction with I/O ports or the embedded
+method          controller and this test frame work is spoofing these
+method          operations. However, it is worth sanity checking these
+method          values in /sys/class/thermal/thermal_zone*.
+method          
+method          PASSED: Test 27, \_SB_.PCI0.LPCB.EC0_.BAC1 correctly
+method          acquired and released locks 6 times.
 method          
 method          SKIPPED: Test 27, Skipping test for non-existant object
 method          AC2.
@@ -1151,7 +1172,7 @@ method          values as expected.
 method          PASSED: Test 93, \_SB_.PCI0.GFX0.DD05._DSS correctly
 method          acquired and released locks 4 times.
 method          
-method          =========================================================
-method          166 passed, 0 failed, 5 warnings, 0 aborted, 79 skipped, 0
+method          ==========================================================
+method          312 passed, 2 failed, 5 warnings, 0 aborted, 75 skipped, 0
 method          info only.
-method          =========================================================
+method          ==========================================================
diff --git a/method-0001/test-0001.sh b/method-0001/test-0001.sh
index 834b816..f210616 100755
--- a/method-0001/test-0001.sh
+++ b/method-0001/test-0001.sh
@@ -4,7 +4,7 @@ TEST="Test method against known correct ACPI tables"
 NAME=test-0001.sh
 TMPLOG=$TMP/method.log.$$
 
-$FWTS -w 80 --dumpfile=acpidump-0001.log method - | grep "^[0-9]*[ ]*method" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log method - | grep "^[0-9]*[ ]*method" | cut -c7- > $TMPLOG
 diff $TMPLOG method-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
@@ -13,5 +13,5 @@ else
 	echo FAILED: $TEST, $NAME
 fi
 
-#rm $TMPLOG
+rm $TMPLOG
 exit $ret
-- 
1.7.10