diff mbox

[3/3] fwts-test: Add regression test for WPBT

Message ID 1471580770-28637-3-git-send-email-alex.hung@canonical.com
State Accepted
Headers show

Commit Message

Alex Hung Aug. 19, 2016, 4:26 a.m. UTC 
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 Makefile.am                           |  2 ++
 fwts-test/wpbt-0001/acpidump-0001.log | 37 +++++++++++++++++++++++++++++++++++
 fwts-test/wpbt-0001/acpidump-0002.log | 37 +++++++++++++++++++++++++++++++++++
 fwts-test/wpbt-0001/test-0001.sh      | 23 ++++++++++++++++++++++
 fwts-test/wpbt-0001/test-0002.sh      | 23 ++++++++++++++++++++++
 fwts-test/wpbt-0001/wpbt-0001.log     | 16 +++++++++++++++
 fwts-test/wpbt-0001/wpbt-0002.log     | 18 +++++++++++++++++
 7 files changed, 156 insertions(+)
 create mode 100644 fwts-test/wpbt-0001/acpidump-0001.log
 create mode 100644 fwts-test/wpbt-0001/acpidump-0002.log
 create mode 100755 fwts-test/wpbt-0001/test-0001.sh
 create mode 100755 fwts-test/wpbt-0001/test-0002.sh
 create mode 100644 fwts-test/wpbt-0001/wpbt-0001.log
 create mode 100644 fwts-test/wpbt-0001/wpbt-0002.log

Comments

Colin Ian King Aug. 19, 2016, 8:36 a.m. UTC | #1 
On 19/08/16 05:26, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  Makefile.am                           |  2 ++
>  fwts-test/wpbt-0001/acpidump-0001.log | 37 +++++++++++++++++++++++++++++++++++
>  fwts-test/wpbt-0001/acpidump-0002.log | 37 +++++++++++++++++++++++++++++++++++
>  fwts-test/wpbt-0001/test-0001.sh      | 23 ++++++++++++++++++++++
>  fwts-test/wpbt-0001/test-0002.sh      | 23 ++++++++++++++++++++++
>  fwts-test/wpbt-0001/wpbt-0001.log     | 16 +++++++++++++++
>  fwts-test/wpbt-0001/wpbt-0002.log     | 18 +++++++++++++++++
>  7 files changed, 156 insertions(+)
>  create mode 100644 fwts-test/wpbt-0001/acpidump-0001.log
>  create mode 100644 fwts-test/wpbt-0001/acpidump-0002.log
>  create mode 100755 fwts-test/wpbt-0001/test-0001.sh
>  create mode 100755 fwts-test/wpbt-0001/test-0002.sh
>  create mode 100644 fwts-test/wpbt-0001/wpbt-0001.log
>  create mode 100644 fwts-test/wpbt-0001/wpbt-0002.log
> 
> diff --git a/Makefile.am b/Makefile.am
> index 67dc55a..f942f7a 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -133,6 +133,8 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \
>  	fwts-test/wdat-0001/test-0001.sh \
>  	fwts-test/wdat-0001/test-0002.sh \
>  	fwts-test/wmi-0001/test-0001.sh \
> +	fwts-test/wpbt-0001/test-0001.sh \
> +	fwts-test/wpbt-0001/test-0002.sh \
>  	fwts-test/wmi-0001/test-0002.sh \
>  	fwts-test/wmi-0001/test-0003.sh \
>  	fwts-test/xenv-0001/test-0001.sh \
> diff --git a/fwts-test/wpbt-0001/acpidump-0001.log b/fwts-test/wpbt-0001/acpidump-0001.log
> new file mode 100644
> index 0000000..45f794e
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/acpidump-0001.log
> @@ -0,0 +1,37 @@
> +FACS @ 0x00000000
> +  0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00  FACS@...........
> +  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0020: 01 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  ................
> +
> +FACP @ 0x00000000
> +  0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20  FACP......AMD   
> +  0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20  GUAM    ....AMD 
> +  0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00  @B.../...G......
> +  0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00  ................
> +  0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00  ................
> +  0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00   ...............
> +  0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00  e...........2...
> +  0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af  ...../.......G..
> +  0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00  ..... ..........
> +  00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00  ................
> +  00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00  ................
> +  00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00  . ...........@..
> +  00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ...............
> +  00f0: 00 00 00 00                                      ....
> +
> +WPBT @ 0x0000000000000000
> +  0000: 57 50 42 54 98 00 00 00 01 23 49 4e 54 45 4c 20  WPBT.....#INTEL 
> +  0010: 54 45 4d 50 4c 41 54 45 01 00 00 00 49 4e 54 4c  TEMPLATE....INTL
> +  0020: 27 05 16 20 78 56 34 12 00 00 00 bb 00 00 00 aa  '.. xV4.........
> +  0030: 01 01 64 00 34 00 20 00 73 00 63 00 6f 00 72 00  ..d.4. .s.c.o.r.
> +  0040: 65 00 20 00 61 00 6e 00 64 00 20 00 37 00 20 00  e. .a.n.d. .7. .
> +  0050: 79 00 65 00 61 00 72 00 73 00 20 00 61 00 67 00  y.e.a.r.s. .a.g.
> +  0060: 6f 00 20 00 6f 00 75 00 72 00 20 00 66 00 61 00  o. .o.u.r. .f.a.
> +  0070: 74 00 68 00 65 00 72 00 73 00 20 00 62 00 72 00  t.h.e.r.s. .b.r.
> +  0080: 6f 00 75 00 67 00 68 00 74 00 20 00 66 00 6f 00  o.u.g.h.t. .f.o.
> +  0090: 72 00 74 00 68 00 00 00                          r.t.h...
> +                                                                          
> diff --git a/fwts-test/wpbt-0001/acpidump-0002.log b/fwts-test/wpbt-0001/acpidump-0002.log
> new file mode 100644
> index 0000000..523f136
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/acpidump-0002.log
> @@ -0,0 +1,37 @@
> +FACS @ 0x00000000
> +  0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00  FACS@...........
> +  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0020: 01 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  ................
> +
> +FACP @ 0x00000000
> +  0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20  FACP......AMD   
> +  0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20  GUAM    ....AMD 
> +  0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00  @B.../...G......
> +  0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00  ................
> +  0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00  ................
> +  0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00   ...............
> +  0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00  e...........2...
> +  0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af  ...../.......G..
> +  0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00  ..... ..........
> +  00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00  ................
> +  00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00  ................
> +  00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00  . ...........@..
> +  00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ...............
> +  00f0: 00 00 00 00                                      ....
> +
> +WPBT @ 0x0000000000000000
> +  0000: 57 50 42 54 98 00 00 00 01 6a 49 4e 54 45 4c 20  WPBT.....jINTEL 
> +  0010: 54 45 4d 50 4c 41 54 45 01 00 00 00 49 4e 54 4c  TEMPLATE....INTL
> +  0020: 27 05 16 20 78 56 34 12 00 00 00 bb 00 00 00 aa  '.. xV4.........
> +  0030: 33 88 64 00 34 00 20 00 73 00 63 00 6f 00 72 00  3.d.4. .s.c.o.r.
> +  0040: 65 00 20 00 61 00 6e 00 64 00 20 00 37 00 20 00  e. .a.n.d. .7. .
> +  0050: 79 00 65 00 61 00 72 00 73 00 20 00 61 00 67 00  y.e.a.r.s. .a.g.
> +  0060: 6f 00 20 00 6f 00 75 00 72 00 20 00 66 00 61 00  o. .o.u.r. .f.a.
> +  0070: 74 00 68 00 65 00 72 00 73 00 20 00 62 00 72 00  t.h.e.r.s. .b.r.
> +  0080: 6f 00 75 00 67 00 68 00 74 00 20 00 66 00 6f 00  o.u.g.h.t. .f.o.
> +  0090: 72 00 74 00 68 00 00 00                          r.t.h...
> +
> diff --git a/fwts-test/wpbt-0001/test-0001.sh b/fwts-test/wpbt-0001/test-0001.sh
> new file mode 100755
> index 0000000..a18f60d
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/test-0001.sh
> @@ -0,0 +1,23 @@
> +#!/bin/bash
> +#
> +TEST="Test apcitables against WPBT"
> +NAME=test-0001.sh
> +TMPLOG=$TMP/wpbt.log.$$
> +
> +$FWTS --show-tests | grep wpbt > /dev/null
> +if [ $? -eq 1 ]; then
> +	echo SKIP: $TEST, $NAME
> +	exit 77
> +fi
> +
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/wpbt-0001/acpidump-0001.log wpbt - | cut -c7- | grep "^wpbt" > $TMPLOG
> +diff $TMPLOG $FWTSTESTDIR/wpbt-0001/wpbt-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/wpbt-0001/test-0002.sh b/fwts-test/wpbt-0001/test-0002.sh
> new file mode 100755
> index 0000000..ff64e20
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/test-0002.sh
> @@ -0,0 +1,23 @@
> +#!/bin/bash
> +#
> +TEST="Test apcitables against invalid WPBT"
> +NAME=test-0001.sh
> +TMPLOG=$TMP/wpbt.log.$$
> +
> +$FWTS --show-tests | grep wpbt > /dev/null
> +if [ $? -eq 1 ]; then
> +	echo SKIP: $TEST, $NAME
> +	exit 77
> +fi
> +
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/wpbt-0001/acpidump-0002.log wpbt - | cut -c7- | grep "^wpbt" > $TMPLOG
> +diff $TMPLOG $FWTSTESTDIR/wpbt-0001/wpbt-0002.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/wpbt-0001/wpbt-0001.log b/fwts-test/wpbt-0001/wpbt-0001.log
> new file mode 100644
> index 0000000..1816c3e
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/wpbt-0001.log
> @@ -0,0 +1,16 @@
> +wpbt            wpbt: WPBT Windows Platform Binary Table test.
> +wpbt            ----------------------------------------------------------
> +wpbt            Test 1 of 1: WPBT Windows Platform Binary Table test.
> +wpbt            WPBT Windows Platform Binary Table:
> +wpbt              Handoff Memory Size:      0x12345678
> +wpbt              Handoff Memory Location:  0xaa000000bb000000
> +wpbt              Content Layout:           0x01
> +wpbt              Content Type:             0x01
> +wpbt              Arguments Length:         0x0064
> +wpbt            
> +wpbt            PASSED: Test 1, No issues found in WPBT table.
> +wpbt            
> +wpbt            ==========================================================
> +wpbt            1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
> +wpbt            info only.
> +wpbt            ==========================================================
> diff --git a/fwts-test/wpbt-0001/wpbt-0002.log b/fwts-test/wpbt-0001/wpbt-0002.log
> new file mode 100644
> index 0000000..24a2b0c
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/wpbt-0002.log
> @@ -0,0 +1,18 @@
> +wpbt            wpbt: WPBT Windows Platform Binary Table test.
> +wpbt            ----------------------------------------------------------
> +wpbt            Test 1 of 1: WPBT Windows Platform Binary Table test.
> +wpbt            WPBT Windows Platform Binary Table:
> +wpbt              Handoff Memory Size:      0x12345678
> +wpbt              Handoff Memory Location:  0xaa000000bb000000
> +wpbt              Content Layout:           0x33
> +wpbt              Content Type:             0x88
> +wpbt            FAILED [HIGH] WPBTBadLayout: Test 1, WPBT supports Conent
> +wpbt            Layout 1 only, got 0x33 instead
> +wpbt            FAILED [HIGH] WPBTBadType: Test 1, WPBT supports Content
> +wpbt            Type 1 only, got 0x88 instead
> +wpbt            
> +wpbt            
> +wpbt            ==========================================================
> +wpbt            0 passed, 2 failed, 0 warning, 0 aborted, 0 skipped, 0
> +wpbt            info only.
> +wpbt            ==========================================================
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
Ivan Hu Aug. 29, 2016, 2:40 a.m. UTC | #2 
On 2016年08月19日 12:26, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  Makefile.am                           |  2 ++
>  fwts-test/wpbt-0001/acpidump-0001.log | 37 +++++++++++++++++++++++++++++++++++
>  fwts-test/wpbt-0001/acpidump-0002.log | 37 +++++++++++++++++++++++++++++++++++
>  fwts-test/wpbt-0001/test-0001.sh      | 23 ++++++++++++++++++++++
>  fwts-test/wpbt-0001/test-0002.sh      | 23 ++++++++++++++++++++++
>  fwts-test/wpbt-0001/wpbt-0001.log     | 16 +++++++++++++++
>  fwts-test/wpbt-0001/wpbt-0002.log     | 18 +++++++++++++++++
>  7 files changed, 156 insertions(+)
>  create mode 100644 fwts-test/wpbt-0001/acpidump-0001.log
>  create mode 100644 fwts-test/wpbt-0001/acpidump-0002.log
>  create mode 100755 fwts-test/wpbt-0001/test-0001.sh
>  create mode 100755 fwts-test/wpbt-0001/test-0002.sh
>  create mode 100644 fwts-test/wpbt-0001/wpbt-0001.log
>  create mode 100644 fwts-test/wpbt-0001/wpbt-0002.log
>
> diff --git a/Makefile.am b/Makefile.am
> index 67dc55a..f942f7a 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -133,6 +133,8 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \
>  	fwts-test/wdat-0001/test-0001.sh \
>  	fwts-test/wdat-0001/test-0002.sh \
>  	fwts-test/wmi-0001/test-0001.sh \
> +	fwts-test/wpbt-0001/test-0001.sh \
> +	fwts-test/wpbt-0001/test-0002.sh \
>  	fwts-test/wmi-0001/test-0002.sh \
>  	fwts-test/wmi-0001/test-0003.sh \
>  	fwts-test/xenv-0001/test-0001.sh \
> diff --git a/fwts-test/wpbt-0001/acpidump-0001.log b/fwts-test/wpbt-0001/acpidump-0001.log
> new file mode 100644
> index 0000000..45f794e
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/acpidump-0001.log
> @@ -0,0 +1,37 @@
> +FACS @ 0x00000000
> +  0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00  FACS@...........
> +  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0020: 01 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  ................
> +
> +FACP @ 0x00000000
> +  0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20  FACP......AMD
> +  0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20  GUAM    ....AMD
> +  0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00  @B.../...G......
> +  0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00  ................
> +  0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00  ................
> +  0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00   ...............
> +  0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00  e...........2...
> +  0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af  ...../.......G..
> +  0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00  ..... ..........
> +  00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00  ................
> +  00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00  ................
> +  00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00  . ...........@..
> +  00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ...............
> +  00f0: 00 00 00 00                                      ....
> +
> +WPBT @ 0x0000000000000000
> +  0000: 57 50 42 54 98 00 00 00 01 23 49 4e 54 45 4c 20  WPBT.....#INTEL
> +  0010: 54 45 4d 50 4c 41 54 45 01 00 00 00 49 4e 54 4c  TEMPLATE....INTL
> +  0020: 27 05 16 20 78 56 34 12 00 00 00 bb 00 00 00 aa  '.. xV4.........
> +  0030: 01 01 64 00 34 00 20 00 73 00 63 00 6f 00 72 00  ..d.4. .s.c.o.r.
> +  0040: 65 00 20 00 61 00 6e 00 64 00 20 00 37 00 20 00  e. .a.n.d. .7. .
> +  0050: 79 00 65 00 61 00 72 00 73 00 20 00 61 00 67 00  y.e.a.r.s. .a.g.
> +  0060: 6f 00 20 00 6f 00 75 00 72 00 20 00 66 00 61 00  o. .o.u.r. .f.a.
> +  0070: 74 00 68 00 65 00 72 00 73 00 20 00 62 00 72 00  t.h.e.r.s. .b.r.
> +  0080: 6f 00 75 00 67 00 68 00 74 00 20 00 66 00 6f 00  o.u.g.h.t. .f.o.
> +  0090: 72 00 74 00 68 00 00 00                          r.t.h...
> +
> diff --git a/fwts-test/wpbt-0001/acpidump-0002.log b/fwts-test/wpbt-0001/acpidump-0002.log
> new file mode 100644
> index 0000000..523f136
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/acpidump-0002.log
> @@ -0,0 +1,37 @@
> +FACS @ 0x00000000
> +  0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00  FACS@...........
> +  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0020: 01 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  ................
> +
> +FACP @ 0x00000000
> +  0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20  FACP......AMD
> +  0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20  GUAM    ....AMD
> +  0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00  @B.../...G......
> +  0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00  ................
> +  0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00  ................
> +  0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00   ...............
> +  0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00  e...........2...
> +  0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af  ...../.......G..
> +  0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00  ..... ..........
> +  00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00  ................
> +  00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00  ................
> +  00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00  . ...........@..
> +  00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ...............
> +  00f0: 00 00 00 00                                      ....
> +
> +WPBT @ 0x0000000000000000
> +  0000: 57 50 42 54 98 00 00 00 01 6a 49 4e 54 45 4c 20  WPBT.....jINTEL
> +  0010: 54 45 4d 50 4c 41 54 45 01 00 00 00 49 4e 54 4c  TEMPLATE....INTL
> +  0020: 27 05 16 20 78 56 34 12 00 00 00 bb 00 00 00 aa  '.. xV4.........
> +  0030: 33 88 64 00 34 00 20 00 73 00 63 00 6f 00 72 00  3.d.4. .s.c.o.r.
> +  0040: 65 00 20 00 61 00 6e 00 64 00 20 00 37 00 20 00  e. .a.n.d. .7. .
> +  0050: 79 00 65 00 61 00 72 00 73 00 20 00 61 00 67 00  y.e.a.r.s. .a.g.
> +  0060: 6f 00 20 00 6f 00 75 00 72 00 20 00 66 00 61 00  o. .o.u.r. .f.a.
> +  0070: 74 00 68 00 65 00 72 00 73 00 20 00 62 00 72 00  t.h.e.r.s. .b.r.
> +  0080: 6f 00 75 00 67 00 68 00 74 00 20 00 66 00 6f 00  o.u.g.h.t. .f.o.
> +  0090: 72 00 74 00 68 00 00 00                          r.t.h...
> +
> diff --git a/fwts-test/wpbt-0001/test-0001.sh b/fwts-test/wpbt-0001/test-0001.sh
> new file mode 100755
> index 0000000..a18f60d
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/test-0001.sh
> @@ -0,0 +1,23 @@
> +#!/bin/bash
> +#
> +TEST="Test apcitables against WPBT"
> +NAME=test-0001.sh
> +TMPLOG=$TMP/wpbt.log.$$
> +
> +$FWTS --show-tests | grep wpbt > /dev/null
> +if [ $? -eq 1 ]; then
> +	echo SKIP: $TEST, $NAME
> +	exit 77
> +fi
> +
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/wpbt-0001/acpidump-0001.log wpbt - | cut -c7- | grep "^wpbt" > $TMPLOG
> +diff $TMPLOG $FWTSTESTDIR/wpbt-0001/wpbt-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/wpbt-0001/test-0002.sh b/fwts-test/wpbt-0001/test-0002.sh
> new file mode 100755
> index 0000000..ff64e20
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/test-0002.sh
> @@ -0,0 +1,23 @@
> +#!/bin/bash
> +#
> +TEST="Test apcitables against invalid WPBT"
> +NAME=test-0001.sh
> +TMPLOG=$TMP/wpbt.log.$$
> +
> +$FWTS --show-tests | grep wpbt > /dev/null
> +if [ $? -eq 1 ]; then
> +	echo SKIP: $TEST, $NAME
> +	exit 77
> +fi
> +
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/wpbt-0001/acpidump-0002.log wpbt - | cut -c7- | grep "^wpbt" > $TMPLOG
> +diff $TMPLOG $FWTSTESTDIR/wpbt-0001/wpbt-0002.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/wpbt-0001/wpbt-0001.log b/fwts-test/wpbt-0001/wpbt-0001.log
> new file mode 100644
> index 0000000..1816c3e
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/wpbt-0001.log
> @@ -0,0 +1,16 @@
> +wpbt            wpbt: WPBT Windows Platform Binary Table test.
> +wpbt            ----------------------------------------------------------
> +wpbt            Test 1 of 1: WPBT Windows Platform Binary Table test.
> +wpbt            WPBT Windows Platform Binary Table:
> +wpbt              Handoff Memory Size:      0x12345678
> +wpbt              Handoff Memory Location:  0xaa000000bb000000
> +wpbt              Content Layout:           0x01
> +wpbt              Content Type:             0x01
> +wpbt              Arguments Length:         0x0064
> +wpbt
> +wpbt            PASSED: Test 1, No issues found in WPBT table.
> +wpbt
> +wpbt            ==========================================================
> +wpbt            1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
> +wpbt            info only.
> +wpbt            ==========================================================
> diff --git a/fwts-test/wpbt-0001/wpbt-0002.log b/fwts-test/wpbt-0001/wpbt-0002.log
> new file mode 100644
> index 0000000..24a2b0c
> --- /dev/null
> +++ b/fwts-test/wpbt-0001/wpbt-0002.log
> @@ -0,0 +1,18 @@
> +wpbt            wpbt: WPBT Windows Platform Binary Table test.
> +wpbt            ----------------------------------------------------------
> +wpbt            Test 1 of 1: WPBT Windows Platform Binary Table test.
> +wpbt            WPBT Windows Platform Binary Table:
> +wpbt              Handoff Memory Size:      0x12345678
> +wpbt              Handoff Memory Location:  0xaa000000bb000000
> +wpbt              Content Layout:           0x33
> +wpbt              Content Type:             0x88
> +wpbt            FAILED [HIGH] WPBTBadLayout: Test 1, WPBT supports Conent
> +wpbt            Layout 1 only, got 0x33 instead
> +wpbt            FAILED [HIGH] WPBTBadType: Test 1, WPBT supports Content
> +wpbt            Type 1 only, got 0x88 instead
> +wpbt
> +wpbt
> +wpbt            ==========================================================
> +wpbt            0 passed, 2 failed, 0 warning, 0 aborted, 0 skipped, 0
> +wpbt            info only.
> +wpbt            ==========================================================
>

Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/Makefile.am b/Makefile.am
index 67dc55a..f942f7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -133,6 +133,8 @@  TESTS = fwts-test/acpidump-0001/test-0001.sh \
 	fwts-test/wdat-0001/test-0001.sh \
 	fwts-test/wdat-0001/test-0002.sh \
 	fwts-test/wmi-0001/test-0001.sh \
+	fwts-test/wpbt-0001/test-0001.sh \
+	fwts-test/wpbt-0001/test-0002.sh \
 	fwts-test/wmi-0001/test-0002.sh \
 	fwts-test/wmi-0001/test-0003.sh \
 	fwts-test/xenv-0001/test-0001.sh \
diff --git a/fwts-test/wpbt-0001/acpidump-0001.log b/fwts-test/wpbt-0001/acpidump-0001.log
new file mode 100644
index 0000000..45f794e
--- /dev/null
+++ b/fwts-test/wpbt-0001/acpidump-0001.log
@@ -0,0 +1,37 @@ 
+FACS @ 0x00000000
+  0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00  FACS@...........
+  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0020: 01 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  ................
+
+FACP @ 0x00000000
+  0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20  FACP......AMD   
+  0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20  GUAM    ....AMD 
+  0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00  @B.../...G......
+  0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00  ................
+  0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00  ................
+  0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00   ...............
+  0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00  e...........2...
+  0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af  ...../.......G..
+  0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00  ..... ..........
+  00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00  ................
+  00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00  ................
+  00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00  . ...........@..
+  00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ...............
+  00f0: 00 00 00 00                                      ....
+
+WPBT @ 0x0000000000000000
+  0000: 57 50 42 54 98 00 00 00 01 23 49 4e 54 45 4c 20  WPBT.....#INTEL 
+  0010: 54 45 4d 50 4c 41 54 45 01 00 00 00 49 4e 54 4c  TEMPLATE....INTL
+  0020: 27 05 16 20 78 56 34 12 00 00 00 bb 00 00 00 aa  '.. xV4.........
+  0030: 01 01 64 00 34 00 20 00 73 00 63 00 6f 00 72 00  ..d.4. .s.c.o.r.
+  0040: 65 00 20 00 61 00 6e 00 64 00 20 00 37 00 20 00  e. .a.n.d. .7. .
+  0050: 79 00 65 00 61 00 72 00 73 00 20 00 61 00 67 00  y.e.a.r.s. .a.g.
+  0060: 6f 00 20 00 6f 00 75 00 72 00 20 00 66 00 61 00  o. .o.u.r. .f.a.
+  0070: 74 00 68 00 65 00 72 00 73 00 20 00 62 00 72 00  t.h.e.r.s. .b.r.
+  0080: 6f 00 75 00 67 00 68 00 74 00 20 00 66 00 6f 00  o.u.g.h.t. .f.o.
+  0090: 72 00 74 00 68 00 00 00                          r.t.h...
+                                                                          
diff --git a/fwts-test/wpbt-0001/acpidump-0002.log b/fwts-test/wpbt-0001/acpidump-0002.log
new file mode 100644
index 0000000..523f136
--- /dev/null
+++ b/fwts-test/wpbt-0001/acpidump-0002.log
@@ -0,0 +1,37 @@ 
+FACS @ 0x00000000
+  0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00  FACS@...........
+  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0020: 01 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  ................
+
+FACP @ 0x00000000
+  0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20  FACP......AMD   
+  0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20  GUAM    ....AMD 
+  0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00  @B.../...G......
+  0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00  ................
+  0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00  ................
+  0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00   ...............
+  0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00  e...........2...
+  0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af  ...../.......G..
+  0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00  ..... ..........
+  00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00  ................
+  00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00  ................
+  00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00  . ...........@..
+  00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ...............
+  00f0: 00 00 00 00                                      ....
+
+WPBT @ 0x0000000000000000
+  0000: 57 50 42 54 98 00 00 00 01 6a 49 4e 54 45 4c 20  WPBT.....jINTEL 
+  0010: 54 45 4d 50 4c 41 54 45 01 00 00 00 49 4e 54 4c  TEMPLATE....INTL
+  0020: 27 05 16 20 78 56 34 12 00 00 00 bb 00 00 00 aa  '.. xV4.........
+  0030: 33 88 64 00 34 00 20 00 73 00 63 00 6f 00 72 00  3.d.4. .s.c.o.r.
+  0040: 65 00 20 00 61 00 6e 00 64 00 20 00 37 00 20 00  e. .a.n.d. .7. .
+  0050: 79 00 65 00 61 00 72 00 73 00 20 00 61 00 67 00  y.e.a.r.s. .a.g.
+  0060: 6f 00 20 00 6f 00 75 00 72 00 20 00 66 00 61 00  o. .o.u.r. .f.a.
+  0070: 74 00 68 00 65 00 72 00 73 00 20 00 62 00 72 00  t.h.e.r.s. .b.r.
+  0080: 6f 00 75 00 67 00 68 00 74 00 20 00 66 00 6f 00  o.u.g.h.t. .f.o.
+  0090: 72 00 74 00 68 00 00 00                          r.t.h...
+
diff --git a/fwts-test/wpbt-0001/test-0001.sh b/fwts-test/wpbt-0001/test-0001.sh
new file mode 100755
index 0000000..a18f60d
--- /dev/null
+++ b/fwts-test/wpbt-0001/test-0001.sh
@@ -0,0 +1,23 @@ 
+#!/bin/bash
+#
+TEST="Test apcitables against WPBT"
+NAME=test-0001.sh
+TMPLOG=$TMP/wpbt.log.$$
+
+$FWTS --show-tests | grep wpbt > /dev/null
+if [ $? -eq 1 ]; then
+	echo SKIP: $TEST, $NAME
+	exit 77
+fi
+
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/wpbt-0001/acpidump-0001.log wpbt - | cut -c7- | grep "^wpbt" > $TMPLOG
+diff $TMPLOG $FWTSTESTDIR/wpbt-0001/wpbt-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/wpbt-0001/test-0002.sh b/fwts-test/wpbt-0001/test-0002.sh
new file mode 100755
index 0000000..ff64e20
--- /dev/null
+++ b/fwts-test/wpbt-0001/test-0002.sh
@@ -0,0 +1,23 @@ 
+#!/bin/bash
+#
+TEST="Test apcitables against invalid WPBT"
+NAME=test-0001.sh
+TMPLOG=$TMP/wpbt.log.$$
+
+$FWTS --show-tests | grep wpbt > /dev/null
+if [ $? -eq 1 ]; then
+	echo SKIP: $TEST, $NAME
+	exit 77
+fi
+
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/wpbt-0001/acpidump-0002.log wpbt - | cut -c7- | grep "^wpbt" > $TMPLOG
+diff $TMPLOG $FWTSTESTDIR/wpbt-0001/wpbt-0002.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/wpbt-0001/wpbt-0001.log b/fwts-test/wpbt-0001/wpbt-0001.log
new file mode 100644
index 0000000..1816c3e
--- /dev/null
+++ b/fwts-test/wpbt-0001/wpbt-0001.log
@@ -0,0 +1,16 @@ 
+wpbt            wpbt: WPBT Windows Platform Binary Table test.
+wpbt            ----------------------------------------------------------
+wpbt            Test 1 of 1: WPBT Windows Platform Binary Table test.
+wpbt            WPBT Windows Platform Binary Table:
+wpbt              Handoff Memory Size:      0x12345678
+wpbt              Handoff Memory Location:  0xaa000000bb000000
+wpbt              Content Layout:           0x01
+wpbt              Content Type:             0x01
+wpbt              Arguments Length:         0x0064
+wpbt            
+wpbt            PASSED: Test 1, No issues found in WPBT table.
+wpbt            
+wpbt            ==========================================================
+wpbt            1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
+wpbt            info only.
+wpbt            ==========================================================
diff --git a/fwts-test/wpbt-0001/wpbt-0002.log b/fwts-test/wpbt-0001/wpbt-0002.log
new file mode 100644
index 0000000..24a2b0c
--- /dev/null
+++ b/fwts-test/wpbt-0001/wpbt-0002.log
@@ -0,0 +1,18 @@ 
+wpbt            wpbt: WPBT Windows Platform Binary Table test.
+wpbt            ----------------------------------------------------------
+wpbt            Test 1 of 1: WPBT Windows Platform Binary Table test.
+wpbt            WPBT Windows Platform Binary Table:
+wpbt              Handoff Memory Size:      0x12345678
+wpbt              Handoff Memory Location:  0xaa000000bb000000
+wpbt              Content Layout:           0x33
+wpbt              Content Type:             0x88
+wpbt            FAILED [HIGH] WPBTBadLayout: Test 1, WPBT supports Conent
+wpbt            Layout 1 only, got 0x33 instead
+wpbt            FAILED [HIGH] WPBTBadType: Test 1, WPBT supports Content
+wpbt            Type 1 only, got 0x88 instead
+wpbt            
+wpbt            
+wpbt            ==========================================================
+wpbt            0 passed, 2 failed, 0 warning, 0 aborted, 0 skipped, 0
+wpbt            info only.
+wpbt            ==========================================================