From patchwork Wed May 16 13:20:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [20/27] osilinux-0001: fix tests to work with new fwts logging From: Colin King X-Patchwork-Id: 159666 Message-Id: <1337174459-21597-21-git-send-email-colin.king@canonical.com> To: fwts-devel@lists.ubuntu.com Date: Wed, 16 May 2012 14:20:51 +0100 From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu --- osilinux-0001/osilinux-0001.log | 6 +++--- osilinux-0001/osilinux-0002.log | 6 +++--- osilinux-0001/test-0001.sh | 2 +- osilinux-0001/test-0002.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/osilinux-0001/osilinux-0001.log b/osilinux-0001/osilinux-0001.log index 5830d2f..7cb6501 100644 --- a/osilinux-0001/osilinux-0001.log +++ b/osilinux-0001/osilinux-0001.log @@ -1,5 +1,5 @@ osilinux Disassemble DSDT to check for _OSI("Linux"). -osilinux --------------------------------------------------------- +osilinux ---------------------------------------------------------- osilinux Test 1 of 1: Disassemble DSDT to check for _OSI("Linux"). osilinux This is not strictly a failure mode, it just alerts one osilinux that this has been defined in the DSDT and probably should @@ -31,7 +31,7 @@ osilinux } osilinux WARNING: Test 1, DSDT implements a deprecated osilinux _OSI("Linux") test. osilinux -osilinux ========================================================= +osilinux ========================================================== osilinux 0 passed, 0 failed, 1 warnings, 0 aborted, 0 skipped, 0 osilinux info only. -osilinux ========================================================= +osilinux ========================================================== diff --git a/osilinux-0001/osilinux-0002.log b/osilinux-0001/osilinux-0002.log index d844c10..11efe3e 100644 --- a/osilinux-0001/osilinux-0002.log +++ b/osilinux-0001/osilinux-0002.log @@ -1,5 +1,5 @@ osilinux Disassemble DSDT to check for _OSI("Linux"). -osilinux --------------------------------------------------------- +osilinux ---------------------------------------------------------- osilinux Test 1 of 1: Disassemble DSDT to check for _OSI("Linux"). osilinux This is not strictly a failure mode, it just alerts one osilinux that this has been defined in the DSDT and probably should @@ -8,7 +8,7 @@ osilinux Windows _OSI strings osilinux PASSED: Test 1, DSDT does not implement a deprecated osilinux _OSI("Linux") test. osilinux -osilinux ========================================================= +osilinux ========================================================== osilinux 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 osilinux info only. -osilinux ========================================================= +osilinux ========================================================== diff --git a/osilinux-0001/test-0001.sh b/osilinux-0001/test-0001.sh index 06d9114..93adeac 100755 --- a/osilinux-0001/test-0001.sh +++ b/osilinux-0001/test-0001.sh @@ -4,7 +4,7 @@ TEST="Test osilinux against known incorrect ACPI tables" NAME=test-0001.sh TMPLOG=$TMP/osilinux.log.$$ -$FWTS -w 80 --dumpfile=acpidump-0001.log osilinux - | grep "^[0-9]*[ ]*osilinux" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log osilinux - | grep "^[0-9]*[ ]*osilinux" | cut -c7- > $TMPLOG diff $TMPLOG osilinux-0001.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then diff --git a/osilinux-0001/test-0002.sh b/osilinux-0001/test-0002.sh index 6114563..4564fa3 100755 --- a/osilinux-0001/test-0002.sh +++ b/osilinux-0001/test-0002.sh @@ -4,7 +4,7 @@ TEST="Test osilinux against known correct ACPI tables" NAME=test-0002.sh TMPLOG=$TMP/osilinux.log.$$ -$FWTS -w 80 --dumpfile=acpidump-0002.log osilinux - | grep "^[0-9]*[ ]*osilinux" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0002.log osilinux - | grep "^[0-9]*[ ]*osilinux" | cut -c7- > $TMPLOG diff $TMPLOG osilinux-0002.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then