diff mbox

[18/30] fwts-test: add XSDT specific test, replaces old acpitables-0007 test

Message ID 1434617382-9980-19-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King June 18, 2015, 8:49 a.m. UTC
From: Colin Ian King <colin.king@canonical.com>

The older acpitables-0007 test is now replaced by the XSDT test

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 Makefile.am                                   |   4 +-
 fwts-test/acpitables-0007/acpidump-0001.log   |  17 ----
 fwts-test/acpitables-0007/acpitables-0001.log | 134 --------------------------
 fwts-test/acpitables-0007/test-0001.sh        |  17 ----
 fwts-test/xsdt-0001/acpidump-0001.log         |  17 ++++
 fwts-test/xsdt-0001/test-0001.sh              |  17 ++++
 fwts-test/xsdt-0001/xsdt.log                  | 121 +++++++++++++++++++++++
 7 files changed, 157 insertions(+), 170 deletions(-)
 delete mode 100644 fwts-test/acpitables-0007/acpidump-0001.log
 delete mode 100644 fwts-test/acpitables-0007/acpitables-0001.log
 delete mode 100755 fwts-test/acpitables-0007/test-0001.sh
 create mode 100644 fwts-test/xsdt-0001/acpidump-0001.log
 create mode 100755 fwts-test/xsdt-0001/test-0001.sh
 create mode 100644 fwts-test/xsdt-0001/xsdt.log

Comments

Alex Hung June 23, 2015, 5:56 a.m. UTC | #1
On 06/18/2015 04:49 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The older acpitables-0007 test is now replaced by the XSDT test
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  Makefile.am                                   |   4 +-
>  fwts-test/acpitables-0007/acpidump-0001.log   |  17 ----
>  fwts-test/acpitables-0007/acpitables-0001.log | 134 --------------------------
>  fwts-test/acpitables-0007/test-0001.sh        |  17 ----
>  fwts-test/xsdt-0001/acpidump-0001.log         |  17 ++++
>  fwts-test/xsdt-0001/test-0001.sh              |  17 ++++
>  fwts-test/xsdt-0001/xsdt.log                  | 121 +++++++++++++++++++++++
>  7 files changed, 157 insertions(+), 170 deletions(-)
>  delete mode 100644 fwts-test/acpitables-0007/acpidump-0001.log
>  delete mode 100644 fwts-test/acpitables-0007/acpitables-0001.log
>  delete mode 100755 fwts-test/acpitables-0007/test-0001.sh
>  create mode 100644 fwts-test/xsdt-0001/acpidump-0001.log
>  create mode 100755 fwts-test/xsdt-0001/test-0001.sh
>  create mode 100644 fwts-test/xsdt-0001/xsdt.log
> 
> diff --git a/Makefile.am b/Makefile.am
> index 20d20e2..cf265e4 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -13,7 +13,6 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \
>  	fwts-test/acpitables-0003/test-0001.sh \
>  	fwts-test/acpitables-0004/test-0001.sh \
>  	fwts-test/acpitables-0005/test-0001.sh \
> -	fwts-test/acpitables-0007/test-0001.sh \
>  	fwts-test/acpitables-0008/test-0001.sh \
>  	fwts-test/apicinstance-0001/test-0001.sh \
>  	fwts-test/apicinstance-0001/test-0002.sh \
> @@ -76,4 +75,5 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \
>  	fwts-test/syntaxcheck-0001/test-0001.sh \
>  	fwts-test/wmi-0001/test-0001.sh \
>  	fwts-test/wmi-0001/test-0002.sh \
> -	fwts-test/wmi-0001/test-0003.sh
> +	fwts-test/wmi-0001/test-0003.sh \
> +	fwts-test/xsdt-0001/test-0001.sh
> diff --git a/fwts-test/acpitables-0007/acpidump-0001.log b/fwts-test/acpitables-0007/acpidump-0001.log
> deleted file mode 100644
> index efe1497..0000000
> --- a/fwts-test/acpitables-0007/acpidump-0001.log
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -XSDT @ 0xbf6d87f0
> -  0000: 58 53 44 54 94 00 00 00 01 9c 4c 45 4e 4f 56 4f  XSDT......LENOVO
> -  0010: 54 50 2d 36 38 20 20 20 00 00 04 06 20 4c 54 50  TP-68   .... LTP
> -  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0090: 00 00 00 00                                      ....
> -
> -RSD PTR @ 0xf7240
> -  0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02  RSD PTR .LENOVO.
> -  0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00  ..m.$.....m.....
> -  0020: 39 00 00 00                                      9...
> -
> diff --git a/fwts-test/acpitables-0007/acpitables-0001.log b/fwts-test/acpitables-0007/acpitables-0001.log
> deleted file mode 100644
> index 10b4c17..0000000
> --- a/fwts-test/acpitables-0007/acpitables-0001.log
> +++ /dev/null
> @@ -1,134 +0,0 @@
> -acpitables      acpitables: ACPI table settings sanity tests.
> -acpitables      ----------------------------------------------------------
> -acpitables      Test 1 of 2: Test ACPI tables.
> -acpitables      Cannot find FACP.
> -acpitables      Table APIC not present to check.
> -acpitables      Table ECDT not present to check.
> -acpitables      Table FACP not present to check.
> -acpitables      Table GTDT not present to check.
> -acpitables      Table HPET not present to check.
> -acpitables      Table MCFG not present to check.
> -acpitables      Table RSDT not present to check.
> -acpitables      Table RSDP not present to check.
> -acpitables      Table SBST not present to check.
> -acpitables      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 0 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 1 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 2 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 3 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 4 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 5 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 6 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 7 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 8 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 9 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 10 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 11 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 12 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 13 is
> -acpitables      null, should not be non-zero.
> -acpitables      
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      Test 2 of 2: Test ACPI headers.
> -acpitables      PASSED: Test 2, Table XSDT has valid signature and ID
> -acpitables      strings.
> -acpitables      
> -acpitables      ==========================================================
> -acpitables      1 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
> -acpitables      info only.
> -acpitables      ==========================================================
> diff --git a/fwts-test/acpitables-0007/test-0001.sh b/fwts-test/acpitables-0007/test-0001.sh
> deleted file mode 100755
> index 8ca8ce9..0000000
> --- a/fwts-test/acpitables-0007/test-0001.sh
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -#!/bin/bash
> -#
> -TEST="Test apcitables against broken ACPI XSDT table"
> -NAME=test-0001.sh
> -TMPLOG=$TMP/acpitables.log.$$
> -
> -$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/acpitables-0007/acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG
> -diff $TMPLOG $FWTSTESTDIR/acpitables-0007/acpitables-0001.log >> $FAILURE_LOG
> -ret=$?
> -if [ $ret -eq 0 ]; then 
> -	echo PASSED: $TEST, $NAME
> -else
> -	echo FAILED: $TEST, $NAME
> -fi
> -
> -rm $TMPLOG
> -exit $ret
> diff --git a/fwts-test/xsdt-0001/acpidump-0001.log b/fwts-test/xsdt-0001/acpidump-0001.log
> new file mode 100644
> index 0000000..efe1497
> --- /dev/null
> +++ b/fwts-test/xsdt-0001/acpidump-0001.log
> @@ -0,0 +1,17 @@
> +XSDT @ 0xbf6d87f0
> +  0000: 58 53 44 54 94 00 00 00 01 9c 4c 45 4e 4f 56 4f  XSDT......LENOVO
> +  0010: 54 50 2d 36 38 20 20 20 00 00 04 06 20 4c 54 50  TP-68   .... LTP
> +  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0090: 00 00 00 00                                      ....
> +
> +RSD PTR @ 0xf7240
> +  0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02  RSD PTR .LENOVO.
> +  0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00  ..m.$.....m.....
> +  0020: 39 00 00 00                                      9...
> +
> diff --git a/fwts-test/xsdt-0001/test-0001.sh b/fwts-test/xsdt-0001/test-0001.sh
> new file mode 100755
> index 0000000..9104de5
> --- /dev/null
> +++ b/fwts-test/xsdt-0001/test-0001.sh
> @@ -0,0 +1,17 @@
> +#!/bin/bash
> +#
> +TEST="Test apcitables against broken ACPI XSDT table"
> +NAME=test-0001.sh
> +TMPLOG=$TMP/xsdt.log.$$
> +
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/xsdt-0001/acpidump-0001.log xsdt - | cut -c7- | grep "^xsdt" > $TMPLOG
> +diff $TMPLOG $FWTSTESTDIR/xsdt-0001/xsdt.log >> $FAILURE_LOG
> +ret=$?
> +if [ $ret -eq 0 ]; then 
> +	echo PASSED: $TEST, $NAME
> +else
> +	echo FAILED: $TEST, $NAME
> +fi
> +
> +rm $TMPLOG
> +exit $ret
> diff --git a/fwts-test/xsdt-0001/xsdt.log b/fwts-test/xsdt-0001/xsdt.log
> new file mode 100644
> index 0000000..49de359
> --- /dev/null
> +++ b/fwts-test/xsdt-0001/xsdt.log
> @@ -0,0 +1,121 @@
> +xsdt            xsdt: XSDT Extended System Description Table test.
> +xsdt            ----------------------------------------------------------
> +xsdt            Cannot find FACP.
> +xsdt            Test 1 of 1: XSDT Extended System Description Table test.
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 0 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 1 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 2 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 3 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 4 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 5 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 6 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 7 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 8 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 9 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 10 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 11 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 12 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 13 is
> +xsdt            null, should not be non-zero.
> +xsdt            
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt            
> +xsdt            
> +xsdt            ==========================================================
> +xsdt            0 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
> +xsdt            info only.
> +xsdt            ==========================================================
> 
Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu June 24, 2015, 6:54 a.m. UTC | #2
On 2015年06月18日 16:49, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The older acpitables-0007 test is now replaced by the XSDT test
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   Makefile.am                                   |   4 +-
>   fwts-test/acpitables-0007/acpidump-0001.log   |  17 ----
>   fwts-test/acpitables-0007/acpitables-0001.log | 134 --------------------------
>   fwts-test/acpitables-0007/test-0001.sh        |  17 ----
>   fwts-test/xsdt-0001/acpidump-0001.log         |  17 ++++
>   fwts-test/xsdt-0001/test-0001.sh              |  17 ++++
>   fwts-test/xsdt-0001/xsdt.log                  | 121 +++++++++++++++++++++++
>   7 files changed, 157 insertions(+), 170 deletions(-)
>   delete mode 100644 fwts-test/acpitables-0007/acpidump-0001.log
>   delete mode 100644 fwts-test/acpitables-0007/acpitables-0001.log
>   delete mode 100755 fwts-test/acpitables-0007/test-0001.sh
>   create mode 100644 fwts-test/xsdt-0001/acpidump-0001.log
>   create mode 100755 fwts-test/xsdt-0001/test-0001.sh
>   create mode 100644 fwts-test/xsdt-0001/xsdt.log
>
> diff --git a/Makefile.am b/Makefile.am
> index 20d20e2..cf265e4 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -13,7 +13,6 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \
>   	fwts-test/acpitables-0003/test-0001.sh \
>   	fwts-test/acpitables-0004/test-0001.sh \
>   	fwts-test/acpitables-0005/test-0001.sh \
> -	fwts-test/acpitables-0007/test-0001.sh \
>   	fwts-test/acpitables-0008/test-0001.sh \
>   	fwts-test/apicinstance-0001/test-0001.sh \
>   	fwts-test/apicinstance-0001/test-0002.sh \
> @@ -76,4 +75,5 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \
>   	fwts-test/syntaxcheck-0001/test-0001.sh \
>   	fwts-test/wmi-0001/test-0001.sh \
>   	fwts-test/wmi-0001/test-0002.sh \
> -	fwts-test/wmi-0001/test-0003.sh
> +	fwts-test/wmi-0001/test-0003.sh \
> +	fwts-test/xsdt-0001/test-0001.sh
> diff --git a/fwts-test/acpitables-0007/acpidump-0001.log b/fwts-test/acpitables-0007/acpidump-0001.log
> deleted file mode 100644
> index efe1497..0000000
> --- a/fwts-test/acpitables-0007/acpidump-0001.log
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -XSDT @ 0xbf6d87f0
> -  0000: 58 53 44 54 94 00 00 00 01 9c 4c 45 4e 4f 56 4f  XSDT......LENOVO
> -  0010: 54 50 2d 36 38 20 20 20 00 00 04 06 20 4c 54 50  TP-68   .... LTP
> -  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0090: 00 00 00 00                                      ....
> -
> -RSD PTR @ 0xf7240
> -  0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02  RSD PTR .LENOVO.
> -  0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00  ..m.$.....m.....
> -  0020: 39 00 00 00                                      9...
> -
> diff --git a/fwts-test/acpitables-0007/acpitables-0001.log b/fwts-test/acpitables-0007/acpitables-0001.log
> deleted file mode 100644
> index 10b4c17..0000000
> --- a/fwts-test/acpitables-0007/acpitables-0001.log
> +++ /dev/null
> @@ -1,134 +0,0 @@
> -acpitables      acpitables: ACPI table settings sanity tests.
> -acpitables      ----------------------------------------------------------
> -acpitables      Test 1 of 2: Test ACPI tables.
> -acpitables      Cannot find FACP.
> -acpitables      Table APIC not present to check.
> -acpitables      Table ECDT not present to check.
> -acpitables      Table FACP not present to check.
> -acpitables      Table GTDT not present to check.
> -acpitables      Table HPET not present to check.
> -acpitables      Table MCFG not present to check.
> -acpitables      Table RSDT not present to check.
> -acpitables      Table RSDP not present to check.
> -acpitables      Table SBST not present to check.
> -acpitables      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 0 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 1 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 2 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 3 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 4 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 5 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 6 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 7 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 8 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 9 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 10 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 11 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 12 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 13 is
> -acpitables      null, should not be non-zero.
> -acpitables
> -acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
> -acpitables      points to an invalid 64 bit ACPI table header. At worse
> -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      Test 2 of 2: Test ACPI headers.
> -acpitables      PASSED: Test 2, Table XSDT has valid signature and ID
> -acpitables      strings.
> -acpitables
> -acpitables      ==========================================================
> -acpitables      1 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
> -acpitables      info only.
> -acpitables      ==========================================================
> diff --git a/fwts-test/acpitables-0007/test-0001.sh b/fwts-test/acpitables-0007/test-0001.sh
> deleted file mode 100755
> index 8ca8ce9..0000000
> --- a/fwts-test/acpitables-0007/test-0001.sh
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -#!/bin/bash
> -#
> -TEST="Test apcitables against broken ACPI XSDT table"
> -NAME=test-0001.sh
> -TMPLOG=$TMP/acpitables.log.$$
> -
> -$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/acpitables-0007/acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG
> -diff $TMPLOG $FWTSTESTDIR/acpitables-0007/acpitables-0001.log >> $FAILURE_LOG
> -ret=$?
> -if [ $ret -eq 0 ]; then
> -	echo PASSED: $TEST, $NAME
> -else
> -	echo FAILED: $TEST, $NAME
> -fi
> -
> -rm $TMPLOG
> -exit $ret
> diff --git a/fwts-test/xsdt-0001/acpidump-0001.log b/fwts-test/xsdt-0001/acpidump-0001.log
> new file mode 100644
> index 0000000..efe1497
> --- /dev/null
> +++ b/fwts-test/xsdt-0001/acpidump-0001.log
> @@ -0,0 +1,17 @@
> +XSDT @ 0xbf6d87f0
> +  0000: 58 53 44 54 94 00 00 00 01 9c 4c 45 4e 4f 56 4f  XSDT......LENOVO
> +  0010: 54 50 2d 36 38 20 20 20 00 00 04 06 20 4c 54 50  TP-68   .... LTP
> +  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0090: 00 00 00 00                                      ....
> +
> +RSD PTR @ 0xf7240
> +  0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02  RSD PTR .LENOVO.
> +  0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00  ..m.$.....m.....
> +  0020: 39 00 00 00                                      9...
> +
> diff --git a/fwts-test/xsdt-0001/test-0001.sh b/fwts-test/xsdt-0001/test-0001.sh
> new file mode 100755
> index 0000000..9104de5
> --- /dev/null
> +++ b/fwts-test/xsdt-0001/test-0001.sh
> @@ -0,0 +1,17 @@
> +#!/bin/bash
> +#
> +TEST="Test apcitables against broken ACPI XSDT table"
> +NAME=test-0001.sh
> +TMPLOG=$TMP/xsdt.log.$$
> +
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/xsdt-0001/acpidump-0001.log xsdt - | cut -c7- | grep "^xsdt" > $TMPLOG
> +diff $TMPLOG $FWTSTESTDIR/xsdt-0001/xsdt.log >> $FAILURE_LOG
> +ret=$?
> +if [ $ret -eq 0 ]; then
> +	echo PASSED: $TEST, $NAME
> +else
> +	echo FAILED: $TEST, $NAME
> +fi
> +
> +rm $TMPLOG
> +exit $ret
> diff --git a/fwts-test/xsdt-0001/xsdt.log b/fwts-test/xsdt-0001/xsdt.log
> new file mode 100644
> index 0000000..49de359
> --- /dev/null
> +++ b/fwts-test/xsdt-0001/xsdt.log
> @@ -0,0 +1,121 @@
> +xsdt            xsdt: XSDT Extended System Description Table test.
> +xsdt            ----------------------------------------------------------
> +xsdt            Cannot find FACP.
> +xsdt            Test 1 of 1: XSDT Extended System Description Table test.
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 0 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 1 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 2 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 3 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 4 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 5 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 6 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 7 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 8 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 9 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 10 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 11 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 12 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 13 is
> +xsdt            null, should not be non-zero.
> +xsdt
> +xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
> +xsdt            points to an invalid 64 bit ACPI table header. At worse
> +xsdt            this will cause the kernel to oops, at best the kernel may
> +xsdt            ignore this. However, it should be fixed where possible.
> +xsdt
> +xsdt
> +xsdt            ==========================================================
> +xsdt            0 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
> +xsdt            info only.
> +xsdt            ==========================================================
Acked-by: Ivan Hu<ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/Makefile.am b/Makefile.am
index 20d20e2..cf265e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,6 @@  TESTS = fwts-test/acpidump-0001/test-0001.sh \
 	fwts-test/acpitables-0003/test-0001.sh \
 	fwts-test/acpitables-0004/test-0001.sh \
 	fwts-test/acpitables-0005/test-0001.sh \
-	fwts-test/acpitables-0007/test-0001.sh \
 	fwts-test/acpitables-0008/test-0001.sh \
 	fwts-test/apicinstance-0001/test-0001.sh \
 	fwts-test/apicinstance-0001/test-0002.sh \
@@ -76,4 +75,5 @@  TESTS = fwts-test/acpidump-0001/test-0001.sh \
 	fwts-test/syntaxcheck-0001/test-0001.sh \
 	fwts-test/wmi-0001/test-0001.sh \
 	fwts-test/wmi-0001/test-0002.sh \
-	fwts-test/wmi-0001/test-0003.sh
+	fwts-test/wmi-0001/test-0003.sh \
+	fwts-test/xsdt-0001/test-0001.sh
diff --git a/fwts-test/acpitables-0007/acpidump-0001.log b/fwts-test/acpitables-0007/acpidump-0001.log
deleted file mode 100644
index efe1497..0000000
--- a/fwts-test/acpitables-0007/acpidump-0001.log
+++ /dev/null
@@ -1,17 +0,0 @@ 
-XSDT @ 0xbf6d87f0
-  0000: 58 53 44 54 94 00 00 00 01 9c 4c 45 4e 4f 56 4f  XSDT......LENOVO
-  0010: 54 50 2d 36 38 20 20 20 00 00 04 06 20 4c 54 50  TP-68   .... LTP
-  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  0090: 00 00 00 00                                      ....
-
-RSD PTR @ 0xf7240
-  0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02  RSD PTR .LENOVO.
-  0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00  ..m.$.....m.....
-  0020: 39 00 00 00                                      9...
-
diff --git a/fwts-test/acpitables-0007/acpitables-0001.log b/fwts-test/acpitables-0007/acpitables-0001.log
deleted file mode 100644
index 10b4c17..0000000
--- a/fwts-test/acpitables-0007/acpitables-0001.log
+++ /dev/null
@@ -1,134 +0,0 @@ 
-acpitables      acpitables: ACPI table settings sanity tests.
-acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 2: Test ACPI tables.
-acpitables      Cannot find FACP.
-acpitables      Table APIC not present to check.
-acpitables      Table ECDT not present to check.
-acpitables      Table FACP not present to check.
-acpitables      Table GTDT not present to check.
-acpitables      Table HPET not present to check.
-acpitables      Table MCFG not present to check.
-acpitables      Table RSDT not present to check.
-acpitables      Table RSDP not present to check.
-acpitables      Table SBST not present to check.
-acpitables      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 0 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 1 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 2 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 3 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 4 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 5 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 6 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 7 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 8 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 9 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 10 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 11 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 12 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 13 is
-acpitables      null, should not be non-zero.
-acpitables      
-acpitables      ADVICE: A XSDT pointer is null and therefore erroneously
-acpitables      points to an invalid 64 bit ACPI table header. At worse
-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      Test 2 of 2: Test ACPI headers.
-acpitables      PASSED: Test 2, Table XSDT has valid signature and ID
-acpitables      strings.
-acpitables      
-acpitables      ==========================================================
-acpitables      1 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
-acpitables      info only.
-acpitables      ==========================================================
diff --git a/fwts-test/acpitables-0007/test-0001.sh b/fwts-test/acpitables-0007/test-0001.sh
deleted file mode 100755
index 8ca8ce9..0000000
--- a/fwts-test/acpitables-0007/test-0001.sh
+++ /dev/null
@@ -1,17 +0,0 @@ 
-#!/bin/bash
-#
-TEST="Test apcitables against broken ACPI XSDT table"
-NAME=test-0001.sh
-TMPLOG=$TMP/acpitables.log.$$
-
-$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/acpitables-0007/acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG
-diff $TMPLOG $FWTSTESTDIR/acpitables-0007/acpitables-0001.log >> $FAILURE_LOG
-ret=$?
-if [ $ret -eq 0 ]; then 
-	echo PASSED: $TEST, $NAME
-else
-	echo FAILED: $TEST, $NAME
-fi
-
-rm $TMPLOG
-exit $ret
diff --git a/fwts-test/xsdt-0001/acpidump-0001.log b/fwts-test/xsdt-0001/acpidump-0001.log
new file mode 100644
index 0000000..efe1497
--- /dev/null
+++ b/fwts-test/xsdt-0001/acpidump-0001.log
@@ -0,0 +1,17 @@ 
+XSDT @ 0xbf6d87f0
+  0000: 58 53 44 54 94 00 00 00 01 9c 4c 45 4e 4f 56 4f  XSDT......LENOVO
+  0010: 54 50 2d 36 38 20 20 20 00 00 04 06 20 4c 54 50  TP-68   .... LTP
+  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0090: 00 00 00 00                                      ....
+
+RSD PTR @ 0xf7240
+  0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02  RSD PTR .LENOVO.
+  0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00  ..m.$.....m.....
+  0020: 39 00 00 00                                      9...
+
diff --git a/fwts-test/xsdt-0001/test-0001.sh b/fwts-test/xsdt-0001/test-0001.sh
new file mode 100755
index 0000000..9104de5
--- /dev/null
+++ b/fwts-test/xsdt-0001/test-0001.sh
@@ -0,0 +1,17 @@ 
+#!/bin/bash
+#
+TEST="Test apcitables against broken ACPI XSDT table"
+NAME=test-0001.sh
+TMPLOG=$TMP/xsdt.log.$$
+
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/xsdt-0001/acpidump-0001.log xsdt - | cut -c7- | grep "^xsdt" > $TMPLOG
+diff $TMPLOG $FWTSTESTDIR/xsdt-0001/xsdt.log >> $FAILURE_LOG
+ret=$?
+if [ $ret -eq 0 ]; then 
+	echo PASSED: $TEST, $NAME
+else
+	echo FAILED: $TEST, $NAME
+fi
+
+rm $TMPLOG
+exit $ret
diff --git a/fwts-test/xsdt-0001/xsdt.log b/fwts-test/xsdt-0001/xsdt.log
new file mode 100644
index 0000000..49de359
--- /dev/null
+++ b/fwts-test/xsdt-0001/xsdt.log
@@ -0,0 +1,121 @@ 
+xsdt            xsdt: XSDT Extended System Description Table test.
+xsdt            ----------------------------------------------------------
+xsdt            Cannot find FACP.
+xsdt            Test 1 of 1: XSDT Extended System Description Table test.
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 0 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 1 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 2 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 3 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 4 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 5 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 6 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 7 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 8 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 9 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 10 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 11 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 12 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            FAILED [MEDIUM] XSDTEntryNull: Test 1, XSDT Entry 13 is
+xsdt            null, should not be non-zero.
+xsdt            
+xsdt            ADVICE: A XSDT pointer is null and therefore erroneously
+xsdt            points to an invalid 64 bit ACPI table header. At worse
+xsdt            this will cause the kernel to oops, at best the kernel may
+xsdt            ignore this. However, it should be fixed where possible.
+xsdt            
+xsdt            
+xsdt            ==========================================================
+xsdt            0 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
+xsdt            info only.
+xsdt            ==========================================================