Patchwork [21/27] syntaxcheck-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-22-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/159667/
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>
---
 syntaxcheck-0001/syntaxcheck-0001.log |    6 +++---
 syntaxcheck-0001/test-0001.sh         |    2 +-
 2 files changed, 4 insertions(+), 4 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>
> ---
>  syntaxcheck-0001/syntaxcheck-0001.log |    6 +++---
>  syntaxcheck-0001/test-0001.sh         |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/syntaxcheck-0001/syntaxcheck-0001.log b/syntaxcheck-0001/syntaxcheck-0001.log
> index 6d7af0e..744a9ff 100644
> --- a/syntaxcheck-0001/syntaxcheck-0001.log
> +++ b/syntaxcheck-0001/syntaxcheck-0001.log
> @@ -1,5 +1,5 @@
>  syntaxcheck     Re-assemble DSDT and find syntax errors and warnings.
> -syntaxcheck     ---------------------------------------------------------
> +syntaxcheck     ----------------------------------------------------------
>  syntaxcheck     Test 1 of 2: Disassemble and reassemble DSDT
>  syntaxcheck     PASSED: Test 1, DSDT (0) reassembly, Found 0 errors, 0
>  syntaxcheck     warnings.
> @@ -16,7 +16,7 @@ syntaxcheck     warnings.
>  syntaxcheck     PASSED: Test 2, SSDT (4) reassembly, Found 0 errors, 0
>  syntaxcheck     warnings.
>  syntaxcheck
> -syntaxcheck     =========================================================
> +syntaxcheck     ==========================================================
>  syntaxcheck     6 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
>  syntaxcheck     info only.
> -syntaxcheck     =========================================================
> +syntaxcheck     ==========================================================
> diff --git a/syntaxcheck-0001/test-0001.sh b/syntaxcheck-0001/test-0001.sh
> index 09d1576..231e314 100755
> --- a/syntaxcheck-0001/test-0001.sh
> +++ b/syntaxcheck-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test syntaxcheck against known correct ACPI tables"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/syntaxcheck.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log syntaxcheck - | grep "^[0-9]*[ ]*syntaxcheck" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log syntaxcheck - | grep "^[0-9]*[ ]*syntaxcheck" | cut -c7- > $TMPLOG
>  diff $TMPLOG syntaxcheck-0001.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:39 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>
> ---
>   syntaxcheck-0001/syntaxcheck-0001.log |    6 +++---
>   syntaxcheck-0001/test-0001.sh         |    2 +-
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/syntaxcheck-0001/syntaxcheck-0001.log b/syntaxcheck-0001/syntaxcheck-0001.log
> index 6d7af0e..744a9ff 100644
> --- a/syntaxcheck-0001/syntaxcheck-0001.log
> +++ b/syntaxcheck-0001/syntaxcheck-0001.log
> @@ -1,5 +1,5 @@
>   syntaxcheck     Re-assemble DSDT and find syntax errors and warnings.
> -syntaxcheck     ---------------------------------------------------------
> +syntaxcheck     ----------------------------------------------------------
>   syntaxcheck     Test 1 of 2: Disassemble and reassemble DSDT
>   syntaxcheck     PASSED: Test 1, DSDT (0) reassembly, Found 0 errors, 0
>   syntaxcheck     warnings.
> @@ -16,7 +16,7 @@ syntaxcheck     warnings.
>   syntaxcheck     PASSED: Test 2, SSDT (4) reassembly, Found 0 errors, 0
>   syntaxcheck     warnings.
>   syntaxcheck
> -syntaxcheck     =========================================================
> +syntaxcheck     ==========================================================
>   syntaxcheck     6 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
>   syntaxcheck     info only.
> -syntaxcheck     =========================================================
> +syntaxcheck     ==========================================================
> diff --git a/syntaxcheck-0001/test-0001.sh b/syntaxcheck-0001/test-0001.sh
> index 09d1576..231e314 100755
> --- a/syntaxcheck-0001/test-0001.sh
> +++ b/syntaxcheck-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test syntaxcheck against known correct ACPI tables"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/syntaxcheck.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log syntaxcheck - | grep "^[0-9]*[ ]*syntaxcheck" | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log syntaxcheck - | grep "^[0-9]*[ ]*syntaxcheck" | cut -c7->  $TMPLOG
>   diff $TMPLOG syntaxcheck-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
Acked-by: Ivan Hu<ivan.hu@canonical.com>

Patch

diff --git a/syntaxcheck-0001/syntaxcheck-0001.log b/syntaxcheck-0001/syntaxcheck-0001.log
index 6d7af0e..744a9ff 100644
--- a/syntaxcheck-0001/syntaxcheck-0001.log
+++ b/syntaxcheck-0001/syntaxcheck-0001.log
@@ -1,5 +1,5 @@ 
 syntaxcheck     Re-assemble DSDT and find syntax errors and warnings.
-syntaxcheck     ---------------------------------------------------------
+syntaxcheck     ----------------------------------------------------------
 syntaxcheck     Test 1 of 2: Disassemble and reassemble DSDT
 syntaxcheck     PASSED: Test 1, DSDT (0) reassembly, Found 0 errors, 0
 syntaxcheck     warnings.
@@ -16,7 +16,7 @@  syntaxcheck     warnings.
 syntaxcheck     PASSED: Test 2, SSDT (4) reassembly, Found 0 errors, 0
 syntaxcheck     warnings.
 syntaxcheck     
-syntaxcheck     =========================================================
+syntaxcheck     ==========================================================
 syntaxcheck     6 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
 syntaxcheck     info only.
-syntaxcheck     =========================================================
+syntaxcheck     ==========================================================
diff --git a/syntaxcheck-0001/test-0001.sh b/syntaxcheck-0001/test-0001.sh
index 09d1576..231e314 100755
--- a/syntaxcheck-0001/test-0001.sh
+++ b/syntaxcheck-0001/test-0001.sh
@@ -4,7 +4,7 @@  TEST="Test syntaxcheck against known correct ACPI tables"
 NAME=test-0001.sh
 TMPLOG=$TMP/syntaxcheck.log.$$
 
-$FWTS -w 80 --dumpfile=acpidump-0001.log syntaxcheck - | grep "^[0-9]*[ ]*syntaxcheck" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log syntaxcheck - | grep "^[0-9]*[ ]*syntaxcheck" | cut -c7- > $TMPLOG
 diff $TMPLOG syntaxcheck-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then