[PATCH 11/27] apininstance-0001: fix tests to work with new fwts logging

[Keng-Yu Lin]

On Wed, May 16, 2012 at 9:20 PM, Colin King <colin.king at canonical.com> wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
>  apicinstance-0001/apicinstance-0001.log |    6 +++---
>  apicinstance-0001/apicinstance-0002.log |    6 +++---
>  apicinstance-0001/test-0001.sh          |    2 +-
>  apicinstance-0001/test-0002.sh          |    2 +-
>  4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/apicinstance-0001/apicinstance-0001.log b/apicinstance-0001/apicinstance-0001.log
> index 36fe7be..328a6c7 100644
> --- a/apicinstance-0001/apicinstance-0001.log
> +++ b/apicinstance-0001/apicinstance-0001.log
> @@ -1,5 +1,5 @@
>  apicinstance    Check for single instance of APIC/MADT table.
> -apicinstance    ---------------------------------------------------------
> +apicinstance    ----------------------------------------------------------
>  apicinstance    Test 1 of 1: Check single instance of APIC/MADT table.
>  apicinstance    Found APIC/MADT table APIC @ bf6dfcc6, length 0x104
>  apicinstance    Found APIC/MADT table APIC @ bf6dff70, length 0x104
> @@ -9,7 +9,7 @@ apicinstance    tables, the kernel expects just one.
>  apicinstance    If you find any APIC issues, perhaps try using
>  apicinstance    acpi_apic_instance=2.
>  apicinstance
> -apicinstance    =========================================================
> +apicinstance    ==========================================================
>  apicinstance    0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
>  apicinstance    info only.
> -apicinstance    =========================================================
> +apicinstance    ==========================================================
> diff --git a/apicinstance-0001/apicinstance-0002.log b/apicinstance-0001/apicinstance-0002.log
> index 317fa73..bec601d 100644
> --- a/apicinstance-0001/apicinstance-0002.log
> +++ b/apicinstance-0001/apicinstance-0002.log
> @@ -1,10 +1,10 @@
>  apicinstance    Check for single instance of APIC/MADT table.
> -apicinstance    ---------------------------------------------------------
> +apicinstance    ----------------------------------------------------------
>  apicinstance    Test 1 of 1: Check single instance of APIC/MADT table.
>  apicinstance    Found APIC/MADT table APIC @ bf6dfcc6, length 0x104
>  apicinstance    PASSED: Test 1, Found 1 APIC/MADT table(s), as expected.
>  apicinstance
> -apicinstance    =========================================================
> +apicinstance    ==========================================================
>  apicinstance    1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
>  apicinstance    info only.
> -apicinstance    =========================================================
> +apicinstance    ==========================================================
> diff --git a/apicinstance-0001/test-0001.sh b/apicinstance-0001/test-0001.sh
> index 0cb099c..799cf4c 100755
> --- a/apicinstance-0001/test-0001.sh
> +++ b/apicinstance-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test apicinstance against known incorrect ACPI tables"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/apicinstance.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log apicinstance - | grep "^[0-9]*[ ]*apicinstance" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log apicinstance - | grep "^[0-9]*[ ]*apicinstance" | cut -c7- > $TMPLOG
>  diff $TMPLOG apicinstance-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/apicinstance-0001/test-0002.sh b/apicinstance-0001/test-0002.sh
> index 7e44dba..0cb6c59 100755
> --- a/apicinstance-0001/test-0002.sh
> +++ b/apicinstance-0001/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test apicinstance against known correct ACPI tables"
>  NAME=test-0002.sh
>  TMPLOG=$TMP/apicinstance.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0002.log apicinstance - | grep "^[0-9]*[ ]*apicinstance" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0002.log apicinstance - | grep "^[0-9]*[ ]*apicinstance" | cut -c7- > $TMPLOG
>  diff $TMPLOG apicinstance-0002.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> --
> 1.7.10
>
Acked-by: Keng-Yu Lin <kengyu at canonical.com>