[PATCH 05/27] acpitables-0003: fix tests to work with new fwts logging

IvanHu ivan.hu at canonical.com
Thu May 24 06:34:13 UTC 2012


On 05/16/2012 09:20 PM, Colin King wrote:
> From: Colin Ian King<colin.king at canonical.com>
>
> Signed-off-by: Colin Ian King<colin.king at canonical.com>
> ---
>   acpitables-0003/acpitables-0001.log |    6 +++---
>   acpitables-0003/test-0001.sh        |    2 +-
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/acpitables-0003/acpitables-0001.log b/acpitables-0003/acpitables-0001.log
> index 372c2f0..b3270d0 100644
> --- a/acpitables-0003/acpitables-0001.log
> +++ b/acpitables-0003/acpitables-0001.log
> @@ -1,5 +1,5 @@
>   acpitables      ACPI table settings sanity checks.
> -acpitables      ---------------------------------------------------------
> +acpitables      ----------------------------------------------------------
>   acpitables      Test 1 of 1: Check ACPI tables.
>   acpitables      Table APIC not present to check.
>   acpitables      Table ECDT not present to check.
> @@ -81,7 +81,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      3 passed, 9 failed, 0 warnings, 0 aborted, 0 skipped, 0
>   acpitables      info only.
> -acpitables      =========================================================
> +acpitables      ==========================================================
> diff --git a/acpitables-0003/test-0001.sh b/acpitables-0003/test-0001.sh
> index a5ee30a..8fff054 100755
> --- a/acpitables-0003/test-0001.sh
> +++ b/acpitables-0003/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test apcitables against broken ACPI FADT"
>   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
Acked-by: Ivan Hu<ivan.hu at canonical.com>




More information about the fwts-devel mailing list