Patchwork [18/27] checksum-0001: fix tests to work with new fwts logging

login
register
mail settings
Submitter Colin King
Date May 16, 2012, 1:20 p.m.
Message ID <1337174459-21597-19-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/159660/
State Accepted
Headers show

Comments

Colin King - May 16, 2012, 1:20 p.m.
From: Colin Ian King <colin.king@canonical.com>

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 checksum-0001/checksum-0001.log |    6 +++---
 checksum-0001/checksum-0003.log |    6 +++---
 checksum-0001/checksum-0004.log |    6 +++---
 checksum-0001/test-0001.sh      |    2 +-
 checksum-0001/test-0003.sh      |    2 +-
 checksum-0001/test-0004.sh      |    2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
Keng-Yu Lin - May 23, 2012, 6:56 a.m.
On Wed, May 16, 2012 at 9:20 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  checksum-0001/checksum-0001.log |    6 +++---
>  checksum-0001/checksum-0003.log |    6 +++---
>  checksum-0001/checksum-0004.log |    6 +++---
>  checksum-0001/test-0001.sh      |    2 +-
>  checksum-0001/test-0003.sh      |    2 +-
>  checksum-0001/test-0004.sh      |    2 +-
>  6 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/checksum-0001/checksum-0001.log b/checksum-0001/checksum-0001.log
> index 35adf16..916c532 100644
> --- a/checksum-0001/checksum-0001.log
> +++ b/checksum-0001/checksum-0001.log
> @@ -1,5 +1,5 @@
>  checksum        Check ACPI table checksum.
> -checksum        -------------------------------------------------------------------------------------------------
> +checksum        --------------------------------------------------------------------------------------------------
>  checksum        Test 1 of 1: Check ACPI table checksums.
>  checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
>  checksum        PASSED: Test 1, Table FACP has correct checksum 0x52.
> @@ -19,6 +19,6 @@ checksum        PASSED: Test 1, Table SSDT has correct checksum 0xdf.
>  checksum        PASSED: Test 1, Table XSDT has correct checksum 0xc2.
>  checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>  checksum
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
>  checksum        19 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
> diff --git a/checksum-0001/checksum-0003.log b/checksum-0001/checksum-0003.log
> index e90cf44..4381f5d 100644
> --- a/checksum-0001/checksum-0003.log
> +++ b/checksum-0001/checksum-0003.log
> @@ -1,5 +1,5 @@
>  checksum        Check ACPI table checksum.
> -checksum        -------------------------------------------------------------------------------------------------
> +checksum        --------------------------------------------------------------------------------------------------
>  checksum        Test 1 of 1: Check ACPI table checksums.
>  checksum        FAILED [LOW] ACPITableChecksum: Test 1, Table DSDT has incorrect checksum, expected 0x11, got
>  checksum        0x10.
> @@ -25,6 +25,6 @@ checksum        PASSED: Test 1, Table SSDT has correct checksum 0xdf.
>  checksum        PASSED: Test 1, Table XSDT has correct checksum 0xc2.
>  checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>  checksum
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
>  checksum        18 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
> diff --git a/checksum-0001/checksum-0004.log b/checksum-0001/checksum-0004.log
> index 775d04c..8848c9d 100644
> --- a/checksum-0001/checksum-0004.log
> +++ b/checksum-0001/checksum-0004.log
> @@ -1,5 +1,5 @@
>  checksum        Check ACPI table checksum.
> -checksum        -------------------------------------------------------------------------------------------------
> +checksum        --------------------------------------------------------------------------------------------------
>  checksum        Test 1 of 1: Check ACPI table checksums.
>  checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
>  checksum        FAILED [LOW] ACPITableChecksum: Test 1, Table FACP has incorrect checksum, expected 0x52, got
> @@ -108,6 +108,6 @@ checksum        lead to ACPI not working correctly.
>  checksum
>  checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>  checksum
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
>  checksum        4 passed, 15 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
> diff --git a/checksum-0001/test-0001.sh b/checksum-0001/test-0001.sh
> index 839e136..89aa14a 100755
> --- a/checksum-0001/test-0001.sh
> +++ b/checksum-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test checksum against known correct ACPI tables"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/checksum.log.$$
>
> -$FWTS -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
>  diff $TMPLOG checksum-0001.log >> $FAILURE_LOG
>  cp $TMPLOG checksum-0001.log
>  ret=$?
> diff --git a/checksum-0001/test-0003.sh b/checksum-0001/test-0003.sh
> index 42c5a45..3db119c 100755
> --- a/checksum-0001/test-0003.sh
> +++ b/checksum-0001/test-0003.sh
> @@ -4,7 +4,7 @@ TEST="Test checksum against incorrect ACPI DSDT table"
>  NAME=test-0003.sh
>  TMPLOG=$TMP/checksum.log.$$
>
> -$FWTS -w 120 --dumpfile=acpidump-0003.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0003.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
>  diff $TMPLOG checksum-0003.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/checksum-0001/test-0004.sh b/checksum-0001/test-0004.sh
> index c45e1f3..b7c40be 100755
> --- a/checksum-0001/test-0004.sh
> +++ b/checksum-0001/test-0004.sh
> @@ -4,7 +4,7 @@ TEST="Test checksum against incorrect ACPI DSDT table"
>  NAME=test-0004.sh
>  TMPLOG=$TMP/checksum.log.$$
>
> -$FWTS -w 120 --dumpfile=acpidump-0004.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0004.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
>  diff $TMPLOG checksum-0004.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> --
> 1.7.10
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Ivan Hu - May 24, 2012, 6:38 a.m.
On 05/16/2012 09:20 PM, Colin King wrote:
> From: Colin Ian King<colin.king@canonical.com>
>
> Signed-off-by: Colin Ian King<colin.king@canonical.com>
> ---
>   checksum-0001/checksum-0001.log |    6 +++---
>   checksum-0001/checksum-0003.log |    6 +++---
>   checksum-0001/checksum-0004.log |    6 +++---
>   checksum-0001/test-0001.sh      |    2 +-
>   checksum-0001/test-0003.sh      |    2 +-
>   checksum-0001/test-0004.sh      |    2 +-
>   6 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/checksum-0001/checksum-0001.log b/checksum-0001/checksum-0001.log
> index 35adf16..916c532 100644
> --- a/checksum-0001/checksum-0001.log
> +++ b/checksum-0001/checksum-0001.log
> @@ -1,5 +1,5 @@
>   checksum        Check ACPI table checksum.
> -checksum        -------------------------------------------------------------------------------------------------
> +checksum        --------------------------------------------------------------------------------------------------
>   checksum        Test 1 of 1: Check ACPI table checksums.
>   checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
>   checksum        PASSED: Test 1, Table FACP has correct checksum 0x52.
> @@ -19,6 +19,6 @@ checksum        PASSED: Test 1, Table SSDT has correct checksum 0xdf.
>   checksum        PASSED: Test 1, Table XSDT has correct checksum 0xc2.
>   checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>   checksum
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
>   checksum        19 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
> diff --git a/checksum-0001/checksum-0003.log b/checksum-0001/checksum-0003.log
> index e90cf44..4381f5d 100644
> --- a/checksum-0001/checksum-0003.log
> +++ b/checksum-0001/checksum-0003.log
> @@ -1,5 +1,5 @@
>   checksum        Check ACPI table checksum.
> -checksum        -------------------------------------------------------------------------------------------------
> +checksum        --------------------------------------------------------------------------------------------------
>   checksum        Test 1 of 1: Check ACPI table checksums.
>   checksum        FAILED [LOW] ACPITableChecksum: Test 1, Table DSDT has incorrect checksum, expected 0x11, got
>   checksum        0x10.
> @@ -25,6 +25,6 @@ checksum        PASSED: Test 1, Table SSDT has correct checksum 0xdf.
>   checksum        PASSED: Test 1, Table XSDT has correct checksum 0xc2.
>   checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>   checksum
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
>   checksum        18 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
> diff --git a/checksum-0001/checksum-0004.log b/checksum-0001/checksum-0004.log
> index 775d04c..8848c9d 100644
> --- a/checksum-0001/checksum-0004.log
> +++ b/checksum-0001/checksum-0004.log
> @@ -1,5 +1,5 @@
>   checksum        Check ACPI table checksum.
> -checksum        -------------------------------------------------------------------------------------------------
> +checksum        --------------------------------------------------------------------------------------------------
>   checksum        Test 1 of 1: Check ACPI table checksums.
>   checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
>   checksum        FAILED [LOW] ACPITableChecksum: Test 1, Table FACP has incorrect checksum, expected 0x52, got
> @@ -108,6 +108,6 @@ checksum        lead to ACPI not working correctly.
>   checksum
>   checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>   checksum
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
>   checksum        4 passed, 15 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> -checksum        =================================================================================================
> +checksum        ==================================================================================================
> diff --git a/checksum-0001/test-0001.sh b/checksum-0001/test-0001.sh
> index 839e136..89aa14a 100755
> --- a/checksum-0001/test-0001.sh
> +++ b/checksum-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test checksum against known correct ACPI tables"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/checksum.log.$$
>
> -$FWTS -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7->  $TMPLOG
>   diff $TMPLOG checksum-0001.log>>  $FAILURE_LOG
>   cp $TMPLOG checksum-0001.log
>   ret=$?
> diff --git a/checksum-0001/test-0003.sh b/checksum-0001/test-0003.sh
> index 42c5a45..3db119c 100755
> --- a/checksum-0001/test-0003.sh
> +++ b/checksum-0001/test-0003.sh
> @@ -4,7 +4,7 @@ TEST="Test checksum against incorrect ACPI DSDT table"
>   NAME=test-0003.sh
>   TMPLOG=$TMP/checksum.log.$$
>
> -$FWTS -w 120 --dumpfile=acpidump-0003.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0003.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7->  $TMPLOG
>   diff $TMPLOG checksum-0003.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/checksum-0001/test-0004.sh b/checksum-0001/test-0004.sh
> index c45e1f3..b7c40be 100755
> --- a/checksum-0001/test-0004.sh
> +++ b/checksum-0001/test-0004.sh
> @@ -4,7 +4,7 @@ TEST="Test checksum against incorrect ACPI DSDT table"
>   NAME=test-0004.sh
>   TMPLOG=$TMP/checksum.log.$$
>
> -$FWTS -w 120 --dumpfile=acpidump-0004.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0004.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7->  $TMPLOG
>   diff $TMPLOG checksum-0004.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
Acked-by: Ivan Hu<ivan.hu@canonical.com>

Patch

diff --git a/checksum-0001/checksum-0001.log b/checksum-0001/checksum-0001.log
index 35adf16..916c532 100644
--- a/checksum-0001/checksum-0001.log
+++ b/checksum-0001/checksum-0001.log
@@ -1,5 +1,5 @@ 
 checksum        Check ACPI table checksum.
-checksum        -------------------------------------------------------------------------------------------------
+checksum        --------------------------------------------------------------------------------------------------
 checksum        Test 1 of 1: Check ACPI table checksums.
 checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
 checksum        PASSED: Test 1, Table FACP has correct checksum 0x52.
@@ -19,6 +19,6 @@  checksum        PASSED: Test 1, Table SSDT has correct checksum 0xdf.
 checksum        PASSED: Test 1, Table XSDT has correct checksum 0xc2.
 checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
 checksum        
-checksum        =================================================================================================
+checksum        ==================================================================================================
 checksum        19 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
-checksum        =================================================================================================
+checksum        ==================================================================================================
diff --git a/checksum-0001/checksum-0003.log b/checksum-0001/checksum-0003.log
index e90cf44..4381f5d 100644
--- a/checksum-0001/checksum-0003.log
+++ b/checksum-0001/checksum-0003.log
@@ -1,5 +1,5 @@ 
 checksum        Check ACPI table checksum.
-checksum        -------------------------------------------------------------------------------------------------
+checksum        --------------------------------------------------------------------------------------------------
 checksum        Test 1 of 1: Check ACPI table checksums.
 checksum        FAILED [LOW] ACPITableChecksum: Test 1, Table DSDT has incorrect checksum, expected 0x11, got
 checksum        0x10.
@@ -25,6 +25,6 @@  checksum        PASSED: Test 1, Table SSDT has correct checksum 0xdf.
 checksum        PASSED: Test 1, Table XSDT has correct checksum 0xc2.
 checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
 checksum        
-checksum        =================================================================================================
+checksum        ==================================================================================================
 checksum        18 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
-checksum        =================================================================================================
+checksum        ==================================================================================================
diff --git a/checksum-0001/checksum-0004.log b/checksum-0001/checksum-0004.log
index 775d04c..8848c9d 100644
--- a/checksum-0001/checksum-0004.log
+++ b/checksum-0001/checksum-0004.log
@@ -1,5 +1,5 @@ 
 checksum        Check ACPI table checksum.
-checksum        -------------------------------------------------------------------------------------------------
+checksum        --------------------------------------------------------------------------------------------------
 checksum        Test 1 of 1: Check ACPI table checksums.
 checksum        PASSED: Test 1, Table DSDT has correct checksum 0x11.
 checksum        FAILED [LOW] ACPITableChecksum: Test 1, Table FACP has incorrect checksum, expected 0x52, got
@@ -108,6 +108,6 @@  checksum        lead to ACPI not working correctly.
 checksum        
 checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
 checksum        
-checksum        =================================================================================================
+checksum        ==================================================================================================
 checksum        4 passed, 15 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
-checksum        =================================================================================================
+checksum        ==================================================================================================
diff --git a/checksum-0001/test-0001.sh b/checksum-0001/test-0001.sh
index 839e136..89aa14a 100755
--- a/checksum-0001/test-0001.sh
+++ b/checksum-0001/test-0001.sh
@@ -4,7 +4,7 @@  TEST="Test checksum against known correct ACPI tables"
 NAME=test-0001.sh
 TMPLOG=$TMP/checksum.log.$$
 
-$FWTS -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
 diff $TMPLOG checksum-0001.log >> $FAILURE_LOG
 cp $TMPLOG checksum-0001.log 
 ret=$?
diff --git a/checksum-0001/test-0003.sh b/checksum-0001/test-0003.sh
index 42c5a45..3db119c 100755
--- a/checksum-0001/test-0003.sh
+++ b/checksum-0001/test-0003.sh
@@ -4,7 +4,7 @@  TEST="Test checksum against incorrect ACPI DSDT table"
 NAME=test-0003.sh
 TMPLOG=$TMP/checksum.log.$$
 
-$FWTS -w 120 --dumpfile=acpidump-0003.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0003.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
 diff $TMPLOG checksum-0003.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/checksum-0001/test-0004.sh b/checksum-0001/test-0004.sh
index c45e1f3..b7c40be 100755
--- a/checksum-0001/test-0004.sh
+++ b/checksum-0001/test-0004.sh
@@ -4,7 +4,7 @@  TEST="Test checksum against incorrect ACPI DSDT table"
 NAME=test-0004.sh
 TMPLOG=$TMP/checksum.log.$$
 
-$FWTS -w 120 --dumpfile=acpidump-0004.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0004.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
 diff $TMPLOG checksum-0004.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then