diff mbox

[04/27] acpitables-0002: fix tests to work with new fwts logging

Message ID 1337174459-21597-5-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

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

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 acpitables-0002/acpitables-0001.log |    6 +++---
 acpitables-0002/acpitables-0002.log |    6 +++---
 acpitables-0002/test-0001.sh        |    2 +-
 acpitables-0002/test-0002.sh        |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

Comments

Keng-Yu Lin May 23, 2012, 6:52 a.m. UTC | #1 
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>
> ---
>  acpitables-0002/acpitables-0001.log |    6 +++---
>  acpitables-0002/acpitables-0002.log |    6 +++---
>  acpitables-0002/test-0001.sh        |    2 +-
>  acpitables-0002/test-0002.sh        |    2 +-
>  4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/acpitables-0002/acpitables-0001.log b/acpitables-0002/acpitables-0001.log
> index 90ca6b9..592e9eb 100644
> --- a/acpitables-0002/acpitables-0001.log
> +++ b/acpitables-0002/acpitables-0001.log
> @@ -1,5 +1,5 @@
>  acpitables      ACPI table settings sanity checks.
> -acpitables      ---------------------------------------------------------
> +acpitables      ----------------------------------------------------------
>  acpitables      Test 1 of 1: Check ACPI tables.
>  acpitables      PASSED: Test 1, Table APIC passed.
>  acpitables      Table ECDT not present to check.
> @@ -11,7 +11,7 @@ acpitables      PASSED: Test 1, Table RSDP passed.
>  acpitables      Table SBST not present to check.
>  acpitables      PASSED: Test 1, Table XSDT passed.
>  acpitables
> -acpitables      =========================================================
> +acpitables      ==========================================================
>  acpitables      4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
>  acpitables      info only.
> -acpitables      =========================================================
> +acpitables      ==========================================================
> diff --git a/acpitables-0002/acpitables-0002.log b/acpitables-0002/acpitables-0002.log
> index 90ca6b9..592e9eb 100644
> --- a/acpitables-0002/acpitables-0002.log
> +++ b/acpitables-0002/acpitables-0002.log
> @@ -1,5 +1,5 @@
>  acpitables      ACPI table settings sanity checks.
> -acpitables      ---------------------------------------------------------
> +acpitables      ----------------------------------------------------------
>  acpitables      Test 1 of 1: Check ACPI tables.
>  acpitables      PASSED: Test 1, Table APIC passed.
>  acpitables      Table ECDT not present to check.
> @@ -11,7 +11,7 @@ acpitables      PASSED: Test 1, Table RSDP passed.
>  acpitables      Table SBST not present to check.
>  acpitables      PASSED: Test 1, Table XSDT passed.
>  acpitables
> -acpitables      =========================================================
> +acpitables      ==========================================================
>  acpitables      4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
>  acpitables      info only.
> -acpitables      =========================================================
> +acpitables      ==========================================================
> diff --git a/acpitables-0002/test-0001.sh b/acpitables-0002/test-0001.sh
> index 40232fe..9081182 100755
> --- a/acpitables-0002/test-0001.sh
> +++ b/acpitables-0002/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test apcitables against known correct ACPI APIC tables"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/acpitables.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG
>  diff $TMPLOG acpitables-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/acpitables-0002/test-0002.sh b/acpitables-0002/test-0002.sh
> index 3d66343..4162a05 100755
> --- a/acpitables-0002/test-0002.sh
> +++ b/acpitables-0002/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test apcitables against incorrect ACPI APIC tables"
>  NAME=test-0002.sh
>  TMPLOG=$TMP/acpitables.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables"| cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables"| cut -c7- > $TMPLOG
>  diff $TMPLOG acpitables-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> --
> 1.7.10
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
ivanhu May 24, 2012, 6:33 a.m. UTC | #2 
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>
> ---
>   acpitables-0002/acpitables-0001.log |    6 +++---
>   acpitables-0002/acpitables-0002.log |    6 +++---
>   acpitables-0002/test-0001.sh        |    2 +-
>   acpitables-0002/test-0002.sh        |    2 +-
>   4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/acpitables-0002/acpitables-0001.log b/acpitables-0002/acpitables-0001.log
> index 90ca6b9..592e9eb 100644
> --- a/acpitables-0002/acpitables-0001.log
> +++ b/acpitables-0002/acpitables-0001.log
> @@ -1,5 +1,5 @@
>   acpitables      ACPI table settings sanity checks.
> -acpitables      ---------------------------------------------------------
> +acpitables      ----------------------------------------------------------
>   acpitables      Test 1 of 1: Check ACPI tables.
>   acpitables      PASSED: Test 1, Table APIC passed.
>   acpitables      Table ECDT not present to check.
> @@ -11,7 +11,7 @@ acpitables      PASSED: Test 1, Table RSDP passed.
>   acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
> -acpitables      =========================================================
> +acpitables      ==========================================================
>   acpitables      4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
>   acpitables      info only.
> -acpitables      =========================================================
> +acpitables      ==========================================================
> diff --git a/acpitables-0002/acpitables-0002.log b/acpitables-0002/acpitables-0002.log
> index 90ca6b9..592e9eb 100644
> --- a/acpitables-0002/acpitables-0002.log
> +++ b/acpitables-0002/acpitables-0002.log
> @@ -1,5 +1,5 @@
>   acpitables      ACPI table settings sanity checks.
> -acpitables      ---------------------------------------------------------
> +acpitables      ----------------------------------------------------------
>   acpitables      Test 1 of 1: Check ACPI tables.
>   acpitables      PASSED: Test 1, Table APIC passed.
>   acpitables      Table ECDT not present to check.
> @@ -11,7 +11,7 @@ acpitables      PASSED: Test 1, Table RSDP passed.
>   acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
> -acpitables      =========================================================
> +acpitables      ==========================================================
>   acpitables      4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
>   acpitables      info only.
> -acpitables      =========================================================
> +acpitables      ==========================================================
> diff --git a/acpitables-0002/test-0001.sh b/acpitables-0002/test-0001.sh
> index 40232fe..9081182 100755
> --- a/acpitables-0002/test-0001.sh
> +++ b/acpitables-0002/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test apcitables against known correct ACPI APIC tables"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/acpitables.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7->  $TMPLOG
>   diff $TMPLOG acpitables-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/acpitables-0002/test-0002.sh b/acpitables-0002/test-0002.sh
> index 3d66343..4162a05 100755
> --- a/acpitables-0002/test-0002.sh
> +++ b/acpitables-0002/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test apcitables against incorrect ACPI APIC tables"
>   NAME=test-0002.sh
>   TMPLOG=$TMP/acpitables.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables"| cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables"| cut -c7->  $TMPLOG
>   diff $TMPLOG acpitables-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
Acked-by: Ivan Hu<ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/acpitables-0002/acpitables-0001.log b/acpitables-0002/acpitables-0001.log
index 90ca6b9..592e9eb 100644
--- a/acpitables-0002/acpitables-0001.log
+++ b/acpitables-0002/acpitables-0001.log
@@ -1,5 +1,5 @@ 
 acpitables      ACPI table settings sanity checks.
-acpitables      ---------------------------------------------------------
+acpitables      ----------------------------------------------------------
 acpitables      Test 1 of 1: Check ACPI tables.
 acpitables      PASSED: Test 1, Table APIC passed.
 acpitables      Table ECDT not present to check.
@@ -11,7 +11,7 @@  acpitables      PASSED: Test 1, Table RSDP passed.
 acpitables      Table SBST not present to check.
 acpitables      PASSED: Test 1, Table XSDT passed.
 acpitables      
-acpitables      =========================================================
+acpitables      ==========================================================
 acpitables      4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
 acpitables      info only.
-acpitables      =========================================================
+acpitables      ==========================================================
diff --git a/acpitables-0002/acpitables-0002.log b/acpitables-0002/acpitables-0002.log
index 90ca6b9..592e9eb 100644
--- a/acpitables-0002/acpitables-0002.log
+++ b/acpitables-0002/acpitables-0002.log
@@ -1,5 +1,5 @@ 
 acpitables      ACPI table settings sanity checks.
-acpitables      ---------------------------------------------------------
+acpitables      ----------------------------------------------------------
 acpitables      Test 1 of 1: Check ACPI tables.
 acpitables      PASSED: Test 1, Table APIC passed.
 acpitables      Table ECDT not present to check.
@@ -11,7 +11,7 @@  acpitables      PASSED: Test 1, Table RSDP passed.
 acpitables      Table SBST not present to check.
 acpitables      PASSED: Test 1, Table XSDT passed.
 acpitables      
-acpitables      =========================================================
+acpitables      ==========================================================
 acpitables      4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
 acpitables      info only.
-acpitables      =========================================================
+acpitables      ==========================================================
diff --git a/acpitables-0002/test-0001.sh b/acpitables-0002/test-0001.sh
index 40232fe..9081182 100755
--- a/acpitables-0002/test-0001.sh
+++ b/acpitables-0002/test-0001.sh
@@ -4,7 +4,7 @@  TEST="Test apcitables against known correct ACPI APIC tables"
 NAME=test-0001.sh
 TMPLOG=$TMP/acpitables.log.$$
 
-$FWTS -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG
 diff $TMPLOG acpitables-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/acpitables-0002/test-0002.sh b/acpitables-0002/test-0002.sh
index 3d66343..4162a05 100755
--- a/acpitables-0002/test-0002.sh
+++ b/acpitables-0002/test-0002.sh
@@ -4,7 +4,7 @@  TEST="Test apcitables against incorrect ACPI APIC tables"
 NAME=test-0002.sh
 TMPLOG=$TMP/acpitables.log.$$
 
-$FWTS -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables"| cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables"| cut -c7- > $TMPLOG
 diff $TMPLOG acpitables-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then