diff mbox

fwts-test: update tpm2 test for new start methods

Message ID 1497897314-23582-1-git-send-email-alex.hung@canonical.com
State Accepted
Headers show

Commit Message

Alex Hung June 19, 2017, 6:35 p.m. UTC
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 fwts-test/tpm2-0001/acpidump-0002.log | 2 +-
 fwts-test/tpm2-0001/tpm2-0002.log     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Colin Ian King June 20, 2017, 8:33 a.m. UTC | #1
On 19/06/17 19:35, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/tpm2-0001/acpidump-0002.log | 2 +-
>  fwts-test/tpm2-0001/tpm2-0002.log     | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fwts-test/tpm2-0001/acpidump-0002.log b/fwts-test/tpm2-0001/acpidump-0002.log
> index fed8105..ee91646 100644
> --- a/fwts-test/tpm2-0001/acpidump-0002.log
> +++ b/fwts-test/tpm2-0001/acpidump-0002.log
> @@ -27,4 +27,4 @@ TPM2 @ 0x00000000
>    0000: 54 50 4D 32 34 00 00 00 03 40 49 4E 54 45 4C 20  TPM24....@INTEL
>    0010: 54 45 4D 50 4C 41 54 45 01 00 00 00 49 4E 54 4C  TEMPLATE....INTL
>    0020: 14 02 14 20 04 00 03 00 77 66 55 44 33 22 11 00  ... ....wfUD3"..
> -  0030: 09 00 00 00                                         ....
> +  0030: 0C 00 00 00                                         ....
> diff --git a/fwts-test/tpm2-0001/tpm2-0002.log b/fwts-test/tpm2-0001/tpm2-0002.log
> index fa3c640..8e8bad7 100644
> --- a/fwts-test/tpm2-0001/tpm2-0002.log
> +++ b/fwts-test/tpm2-0001/tpm2-0002.log
> @@ -5,14 +5,14 @@ tpm2            TPM2 Table:
>  tpm2              Platform Class:                  0x0004
>  tpm2              Reserved:                        0x0003
>  tpm2              Address of Control Area:         0x0011223344556677
> -tpm2              Start Method:                    0x00000009
> +tpm2              Start Method:                    0x0000000c
>  tpm2            FAILED [HIGH] TPM2BadPlatformClass: Test 1, TPM2's
>  tpm2            platform class must be zero (client) or one (server), got
>  tpm2            0x4
>  tpm2            FAILED [LOW] TPM2ReservedNonZero: Test 1, TPM2 reserved
>  tpm2            field must be zero, got 0x0003 instead
>  tpm2            FAILED [HIGH] TPM2BadStartMethod: Test 1, TPM2's Start
> -tpm2            Method must be between one to eight, got 0x9
> +tpm2            Method must be between one to eleven, got 0xc
>  tpm2            
>  tpm2            ==========================================================
>  tpm2            0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
> 

Thanks for fixing up the regression test Alex

Acked-by: Colin Ian King <colin.king@canonical.com>
Ivan Hu June 21, 2017, 2:23 a.m. UTC | #2
On 06/20/2017 02:35 AM, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>   fwts-test/tpm2-0001/acpidump-0002.log | 2 +-
>   fwts-test/tpm2-0001/tpm2-0002.log     | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fwts-test/tpm2-0001/acpidump-0002.log b/fwts-test/tpm2-0001/acpidump-0002.log
> index fed8105..ee91646 100644
> --- a/fwts-test/tpm2-0001/acpidump-0002.log
> +++ b/fwts-test/tpm2-0001/acpidump-0002.log
> @@ -27,4 +27,4 @@ TPM2 @ 0x00000000
>     0000: 54 50 4D 32 34 00 00 00 03 40 49 4E 54 45 4C 20  TPM24....@INTEL
>     0010: 54 45 4D 50 4C 41 54 45 01 00 00 00 49 4E 54 4C  TEMPLATE....INTL
>     0020: 14 02 14 20 04 00 03 00 77 66 55 44 33 22 11 00  ... ....wfUD3"..
> -  0030: 09 00 00 00                                         ....
> +  0030: 0C 00 00 00                                         ....
> diff --git a/fwts-test/tpm2-0001/tpm2-0002.log b/fwts-test/tpm2-0001/tpm2-0002.log
> index fa3c640..8e8bad7 100644
> --- a/fwts-test/tpm2-0001/tpm2-0002.log
> +++ b/fwts-test/tpm2-0001/tpm2-0002.log
> @@ -5,14 +5,14 @@ tpm2            TPM2 Table:
>   tpm2              Platform Class:                  0x0004
>   tpm2              Reserved:                        0x0003
>   tpm2              Address of Control Area:         0x0011223344556677
> -tpm2              Start Method:                    0x00000009
> +tpm2              Start Method:                    0x0000000c
>   tpm2            FAILED [HIGH] TPM2BadPlatformClass: Test 1, TPM2's
>   tpm2            platform class must be zero (client) or one (server), got
>   tpm2            0x4
>   tpm2            FAILED [LOW] TPM2ReservedNonZero: Test 1, TPM2 reserved
>   tpm2            field must be zero, got 0x0003 instead
>   tpm2            FAILED [HIGH] TPM2BadStartMethod: Test 1, TPM2's Start
> -tpm2            Method must be between one to eight, got 0x9
> +tpm2            Method must be between one to eleven, got 0xc
>   tpm2
>   tpm2            ==========================================================
>   tpm2            0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
> 


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

Patch

diff --git a/fwts-test/tpm2-0001/acpidump-0002.log b/fwts-test/tpm2-0001/acpidump-0002.log
index fed8105..ee91646 100644
--- a/fwts-test/tpm2-0001/acpidump-0002.log
+++ b/fwts-test/tpm2-0001/acpidump-0002.log
@@ -27,4 +27,4 @@  TPM2 @ 0x00000000
   0000: 54 50 4D 32 34 00 00 00 03 40 49 4E 54 45 4C 20  TPM24....@INTEL
   0010: 54 45 4D 50 4C 41 54 45 01 00 00 00 49 4E 54 4C  TEMPLATE....INTL
   0020: 14 02 14 20 04 00 03 00 77 66 55 44 33 22 11 00  ... ....wfUD3"..
-  0030: 09 00 00 00                                         ....
+  0030: 0C 00 00 00                                         ....
diff --git a/fwts-test/tpm2-0001/tpm2-0002.log b/fwts-test/tpm2-0001/tpm2-0002.log
index fa3c640..8e8bad7 100644
--- a/fwts-test/tpm2-0001/tpm2-0002.log
+++ b/fwts-test/tpm2-0001/tpm2-0002.log
@@ -5,14 +5,14 @@  tpm2            TPM2 Table:
 tpm2              Platform Class:                  0x0004
 tpm2              Reserved:                        0x0003
 tpm2              Address of Control Area:         0x0011223344556677
-tpm2              Start Method:                    0x00000009
+tpm2              Start Method:                    0x0000000c
 tpm2            FAILED [HIGH] TPM2BadPlatformClass: Test 1, TPM2's
 tpm2            platform class must be zero (client) or one (server), got
 tpm2            0x4
 tpm2            FAILED [LOW] TPM2ReservedNonZero: Test 1, TPM2 reserved
 tpm2            field must be zero, got 0x0003 instead
 tpm2            FAILED [HIGH] TPM2BadStartMethod: Test 1, TPM2's Start
-tpm2            Method must be between one to eight, got 0x9
+tpm2            Method must be between one to eleven, got 0xc
 tpm2            
 tpm2            ==========================================================
 tpm2            0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0