Patchwork [19/26,FWTS-TEST] checksum: update test to keep in sync with fwts framework changes

login
register
mail settings
Submitter Colin King
Date March 13, 2013, 10:28 a.m.
Message ID <1363170533-10188-20-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/227240/
State Accepted
Headers show

Comments

Colin King - March 13, 2013, 10:28 a.m.
From: Colin Ian King <colin.king@canonical.com>

fwts commit 530a24cfd5773ffb3de540c5e53e004c7bef2351 added a test
name into the output of fwts, so add this into the test output.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 checksum-0001/checksum-0001.log | 2 +-
 checksum-0001/checksum-0003.log | 2 +-
 checksum-0001/checksum-0004.log | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Ivan Hu - March 14, 2013, 3:12 a.m.
On 03/13/2013 06:28 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> fwts commit 530a24cfd5773ffb3de540c5e53e004c7bef2351 added a test
> name into the output of fwts, so add this into the test output.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   checksum-0001/checksum-0001.log | 2 +-
>   checksum-0001/checksum-0003.log | 2 +-
>   checksum-0001/checksum-0004.log | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/checksum-0001/checksum-0001.log b/checksum-0001/checksum-0001.log
> index 916c532..7bb324d 100644
> --- a/checksum-0001/checksum-0001.log
> +++ b/checksum-0001/checksum-0001.log
> @@ -1,4 +1,4 @@
> -checksum        Check ACPI table checksum.
> +checksum        checksum: Check ACPI table checksum.
>   checksum        --------------------------------------------------------------------------------------------------
>   checksum        Test 1 of 1: Check ACPI table checksums.
>   checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
> diff --git a/checksum-0001/checksum-0003.log b/checksum-0001/checksum-0003.log
> index 3e16558..367168e 100644
> --- a/checksum-0001/checksum-0003.log
> +++ b/checksum-0001/checksum-0003.log
> @@ -1,4 +1,4 @@
> -checksum        Check ACPI table checksum.
> +checksum        checksum: Check ACPI table checksum.
>   checksum        --------------------------------------------------------------------------------------------------
>   checksum        Test 1 of 1: Check ACPI table checksums.
>   checksum        FAILED [MEDIUM] ACPITableChecksum: Test 1, Table DSDT has incorrect checksum, expected 0x11, got
> diff --git a/checksum-0001/checksum-0004.log b/checksum-0001/checksum-0004.log
> index f1edb15..bf22906 100644
> --- a/checksum-0001/checksum-0004.log
> +++ b/checksum-0001/checksum-0004.log
> @@ -1,4 +1,4 @@
> -checksum        Check ACPI table checksum.
> +checksum        checksum: Check ACPI table checksum.
>   checksum        --------------------------------------------------------------------------------------------------
>   checksum        Test 1 of 1: Check ACPI table checksums.
>   checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
>

Can not patch directly,have conflicts. Patch manually, fix the failure.

Acked-by: Ivan Hu <ivan.hu@canonical.com>
Keng-Yu Lin - March 14, 2013, 6:17 a.m.
On Wed, Mar 13, 2013 at 6:28 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> fwts commit 530a24cfd5773ffb3de540c5e53e004c7bef2351 added a test
> name into the output of fwts, so add this into the test output.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  checksum-0001/checksum-0001.log | 2 +-
>  checksum-0001/checksum-0003.log | 2 +-
>  checksum-0001/checksum-0004.log | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/checksum-0001/checksum-0001.log b/checksum-0001/checksum-0001.log
> index 916c532..7bb324d 100644
> --- a/checksum-0001/checksum-0001.log
> +++ b/checksum-0001/checksum-0001.log
> @@ -1,4 +1,4 @@
> -checksum        Check ACPI table checksum.
> +checksum        checksum: Check ACPI table checksum.
>  checksum        --------------------------------------------------------------------------------------------------
>  checksum        Test 1 of 1: Check ACPI table checksums.
>  checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
> diff --git a/checksum-0001/checksum-0003.log b/checksum-0001/checksum-0003.log
> index 3e16558..367168e 100644
> --- a/checksum-0001/checksum-0003.log
> +++ b/checksum-0001/checksum-0003.log
> @@ -1,4 +1,4 @@
> -checksum        Check ACPI table checksum.
> +checksum        checksum: Check ACPI table checksum.
>  checksum        --------------------------------------------------------------------------------------------------
>  checksum        Test 1 of 1: Check ACPI table checksums.
>  checksum        FAILED [MEDIUM] ACPITableChecksum: Test 1, Table DSDT has incorrect checksum, expected 0x11, got
> diff --git a/checksum-0001/checksum-0004.log b/checksum-0001/checksum-0004.log
> index f1edb15..bf22906 100644
> --- a/checksum-0001/checksum-0004.log
> +++ b/checksum-0001/checksum-0004.log
> @@ -1,4 +1,4 @@
> -checksum        Check ACPI table checksum.
> +checksum        checksum: Check ACPI table checksum.
>  checksum        --------------------------------------------------------------------------------------------------
>  checksum        Test 1 of 1: Check ACPI table checksums.
>  checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
> --
> 1.8.1.2
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>

Patch

diff --git a/checksum-0001/checksum-0001.log b/checksum-0001/checksum-0001.log
index 916c532..7bb324d 100644
--- a/checksum-0001/checksum-0001.log
+++ b/checksum-0001/checksum-0001.log
@@ -1,4 +1,4 @@ 
-checksum        Check ACPI table checksum.
+checksum        checksum: Check ACPI table checksum.
 checksum        --------------------------------------------------------------------------------------------------
 checksum        Test 1 of 1: Check ACPI table checksums.
 checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
diff --git a/checksum-0001/checksum-0003.log b/checksum-0001/checksum-0003.log
index 3e16558..367168e 100644
--- a/checksum-0001/checksum-0003.log
+++ b/checksum-0001/checksum-0003.log
@@ -1,4 +1,4 @@ 
-checksum        Check ACPI table checksum.
+checksum        checksum: Check ACPI table checksum.
 checksum        --------------------------------------------------------------------------------------------------
 checksum        Test 1 of 1: Check ACPI table checksums.
 checksum        FAILED [MEDIUM] ACPITableChecksum: Test 1, Table DSDT has incorrect checksum, expected 0x11, got
diff --git a/checksum-0001/checksum-0004.log b/checksum-0001/checksum-0004.log
index f1edb15..bf22906 100644
--- a/checksum-0001/checksum-0004.log
+++ b/checksum-0001/checksum-0004.log
@@ -1,4 +1,4 @@ 
-checksum        Check ACPI table checksum.
+checksum        checksum: Check ACPI table checksum.
 checksum        --------------------------------------------------------------------------------------------------
 checksum        Test 1 of 1: Check ACPI table checksums.
 checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.