Patchwork [16/27] arg-table-path-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-17-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/159664/
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>
---
 arg-table-path-0001/acpidump-0001.log |    2 +-
 arg-table-path-0001/acpidump.log      |    2 +-
 arg-table-path-0001/test-0001.sh      |    2 +-
 arg-table-path-0001/test-0002.sh      |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
Keng-Yu Lin - May 23, 2012, 6:55 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>
> ---
>  arg-table-path-0001/acpidump-0001.log |    2 +-
>  arg-table-path-0001/acpidump.log      |    2 +-
>  arg-table-path-0001/test-0001.sh      |    2 +-
>  arg-table-path-0001/test-0002.sh      |    4 ++--
>  4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arg-table-path-0001/acpidump-0001.log b/arg-table-path-0001/acpidump-0001.log
> index 04ca658..0770679 100644
> --- a/arg-table-path-0001/acpidump-0001.log
> +++ b/arg-table-path-0001/acpidump-0001.log
> @@ -1,6 +1,6 @@
>  acpidump
>  acpidump        ---------------
> -acpidump        ---------------------------------------------------------
> +acpidump        ----------------------------------------------------------
>  acpidump          0000: 53 4c 49 43 76 01 00 00 01 99 4c 45 4e 4f 56 4f  SLICv.....LENOVO
>  acpidump          0000: 54 43 50 41 32 00 00 00 01 8f 49 6e 74 65 6c 20  TCPA2.....Intel
>  acpidump          0000: 54 4d 4f 52 26 00 00 00 01 eb 50 54 4c 54 44 20  TMOR&.....PTLTD
> diff --git a/arg-table-path-0001/acpidump.log b/arg-table-path-0001/acpidump.log
> index 1afefc8..f3eb022 100644
> --- a/arg-table-path-0001/acpidump.log
> +++ b/arg-table-path-0001/acpidump.log
> @@ -1,5 +1,5 @@
>  00014 acpidump        Dump ACPI tables.
> -00015 acpidump        ---------------------------------------------------------
> +00015 acpidump        ----------------------------------------------------------
>  00016 acpidump        Test 1 of 1: Dump ACPI tables.
>  00017 acpidump        Cannot open directory '/home/king/firmware/fwts/fwts-test
>  00018 acpidump        /arg-table-path-0001/acpidump.dat' to read ACPI tables.
> diff --git a/arg-table-path-0001/test-0001.sh b/arg-table-path-0001/test-0001.sh
> index 9ed0657..d3050f6 100755
> --- a/arg-table-path-0001/test-0001.sh
> +++ b/arg-table-path-0001/test-0001.sh
> @@ -11,7 +11,7 @@ HERE=`pwd`
>  # about output content and not necessary table order, we sort and uniq
>  # the output before we diff.
>  #
> -$FWTS -w 80 --table-path=$HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --table-path=$HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq > $TMPLOG
>  diff $TMPLOG acpidump-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/arg-table-path-0001/test-0002.sh b/arg-table-path-0001/test-0002.sh
> index d8954fc..54906de 100755
> --- a/arg-table-path-0001/test-0002.sh
> +++ b/arg-table-path-0001/test-0002.sh
> @@ -11,7 +11,7 @@ HERE=`pwd`
>  # about output content and not necessary table order, we sort and uniq
>  # the output before we diff.
>  #
> -$FWTS -w 80 -t $HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 -t $HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq > $TMPLOG
>  diff $TMPLOG acpidump-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> @@ -20,5 +20,5 @@ else
>        echo FAILED: $TEST, $NAME
>  fi
>
> -#rm $TMPLOG
> +rm $TMPLOG
>  exit $ret
> --
> 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>
> ---
>   arg-table-path-0001/acpidump-0001.log |    2 +-
>   arg-table-path-0001/acpidump.log      |    2 +-
>   arg-table-path-0001/test-0001.sh      |    2 +-
>   arg-table-path-0001/test-0002.sh      |    4 ++--
>   4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arg-table-path-0001/acpidump-0001.log b/arg-table-path-0001/acpidump-0001.log
> index 04ca658..0770679 100644
> --- a/arg-table-path-0001/acpidump-0001.log
> +++ b/arg-table-path-0001/acpidump-0001.log
> @@ -1,6 +1,6 @@
>   acpidump
>   acpidump        ---------------
> -acpidump        ---------------------------------------------------------
> +acpidump        ----------------------------------------------------------
>   acpidump          0000: 53 4c 49 43 76 01 00 00 01 99 4c 45 4e 4f 56 4f  SLICv.....LENOVO
>   acpidump          0000: 54 43 50 41 32 00 00 00 01 8f 49 6e 74 65 6c 20  TCPA2.....Intel
>   acpidump          0000: 54 4d 4f 52 26 00 00 00 01 eb 50 54 4c 54 44 20  TMOR&.....PTLTD
> diff --git a/arg-table-path-0001/acpidump.log b/arg-table-path-0001/acpidump.log
> index 1afefc8..f3eb022 100644
> --- a/arg-table-path-0001/acpidump.log
> +++ b/arg-table-path-0001/acpidump.log
> @@ -1,5 +1,5 @@
>   00014 acpidump        Dump ACPI tables.
> -00015 acpidump        ---------------------------------------------------------
> +00015 acpidump        ----------------------------------------------------------
>   00016 acpidump        Test 1 of 1: Dump ACPI tables.
>   00017 acpidump        Cannot open directory '/home/king/firmware/fwts/fwts-test
>   00018 acpidump        /arg-table-path-0001/acpidump.dat' to read ACPI tables.
> diff --git a/arg-table-path-0001/test-0001.sh b/arg-table-path-0001/test-0001.sh
> index 9ed0657..d3050f6 100755
> --- a/arg-table-path-0001/test-0001.sh
> +++ b/arg-table-path-0001/test-0001.sh
> @@ -11,7 +11,7 @@ HERE=`pwd`
>   # about output content and not necessary table order, we sort and uniq
>   # the output before we diff.
>   #
> -$FWTS -w 80 --table-path=$HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq>  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --table-path=$HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq>  $TMPLOG
>   diff $TMPLOG acpidump-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/arg-table-path-0001/test-0002.sh b/arg-table-path-0001/test-0002.sh
> index d8954fc..54906de 100755
> --- a/arg-table-path-0001/test-0002.sh
> +++ b/arg-table-path-0001/test-0002.sh
> @@ -11,7 +11,7 @@ HERE=`pwd`
>   # about output content and not necessary table order, we sort and uniq
>   # the output before we diff.
>   #
> -$FWTS -w 80 -t $HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq>  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 -t $HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq>  $TMPLOG
>   diff $TMPLOG acpidump-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> @@ -20,5 +20,5 @@ else
>   	echo FAILED: $TEST, $NAME
>   fi
>
> -#rm $TMPLOG
> +rm $TMPLOG
>   exit $ret
Acked-by: Ivan Hu<ivan.hu@canonical.com>

Patch

diff --git a/arg-table-path-0001/acpidump-0001.log b/arg-table-path-0001/acpidump-0001.log
index 04ca658..0770679 100644
--- a/arg-table-path-0001/acpidump-0001.log
+++ b/arg-table-path-0001/acpidump-0001.log
@@ -1,6 +1,6 @@ 
 acpidump        
 acpidump        ---------------
-acpidump        ---------------------------------------------------------
+acpidump        ----------------------------------------------------------
 acpidump          0000: 53 4c 49 43 76 01 00 00 01 99 4c 45 4e 4f 56 4f  SLICv.....LENOVO
 acpidump          0000: 54 43 50 41 32 00 00 00 01 8f 49 6e 74 65 6c 20  TCPA2.....Intel 
 acpidump          0000: 54 4d 4f 52 26 00 00 00 01 eb 50 54 4c 54 44 20  TMOR&.....PTLTD 
diff --git a/arg-table-path-0001/acpidump.log b/arg-table-path-0001/acpidump.log
index 1afefc8..f3eb022 100644
--- a/arg-table-path-0001/acpidump.log
+++ b/arg-table-path-0001/acpidump.log
@@ -1,5 +1,5 @@ 
 00014 acpidump        Dump ACPI tables.
-00015 acpidump        ---------------------------------------------------------
+00015 acpidump        ----------------------------------------------------------
 00016 acpidump        Test 1 of 1: Dump ACPI tables.
 00017 acpidump        Cannot open directory '/home/king/firmware/fwts/fwts-test
 00018 acpidump        /arg-table-path-0001/acpidump.dat' to read ACPI tables.
diff --git a/arg-table-path-0001/test-0001.sh b/arg-table-path-0001/test-0001.sh
index 9ed0657..d3050f6 100755
--- a/arg-table-path-0001/test-0001.sh
+++ b/arg-table-path-0001/test-0001.sh
@@ -11,7 +11,7 @@  HERE=`pwd`
 # about output content and not necessary table order, we sort and uniq
 # the output before we diff.
 #
-$FWTS -w 80 --table-path=$HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --table-path=$HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq > $TMPLOG
 diff $TMPLOG acpidump-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/arg-table-path-0001/test-0002.sh b/arg-table-path-0001/test-0002.sh
index d8954fc..54906de 100755
--- a/arg-table-path-0001/test-0002.sh
+++ b/arg-table-path-0001/test-0002.sh
@@ -11,7 +11,7 @@  HERE=`pwd`
 # about output content and not necessary table order, we sort and uniq
 # the output before we diff.
 #
-$FWTS -w 80 -t $HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 -t $HERE acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- | sort | uniq > $TMPLOG
 diff $TMPLOG acpidump-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
@@ -20,5 +20,5 @@  else
 	echo FAILED: $TEST, $NAME
 fi
 
-#rm $TMPLOG
+rm $TMPLOG
 exit $ret