Patchwork [19/27] wmi-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-20-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/159663/
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>
---
 wmi-0001/test-0001.sh |    2 +-
 wmi-0001/test-0002.sh |    2 +-
 wmi-0001/test-0003.sh |    2 +-
 wmi-0001/wmi-0001.log |    6 +++---
 wmi-0001/wmi-0002.log |    6 +++---
 wmi-0001/wmi-0003.log |    6 +++---
 6 files changed, 12 insertions(+), 12 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>
> ---
>  wmi-0001/test-0001.sh |    2 +-
>  wmi-0001/test-0002.sh |    2 +-
>  wmi-0001/test-0003.sh |    2 +-
>  wmi-0001/wmi-0001.log |    6 +++---
>  wmi-0001/wmi-0002.log |    6 +++---
>  wmi-0001/wmi-0003.log |    6 +++---
>  6 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/wmi-0001/test-0001.sh b/wmi-0001/test-0001.sh
> index 52b4ad7..10e97da 100755
> --- a/wmi-0001/test-0001.sh
> +++ b/wmi-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test wmi against known correct ACPI tables"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/wmi.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
>  diff $TMPLOG wmi-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/wmi-0001/test-0002.sh b/wmi-0001/test-0002.sh
> index b06dc0c..ec1dbcf 100755
> --- a/wmi-0001/test-0002.sh
> +++ b/wmi-0001/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test wmi against known correct ACPI tables"
>  NAME=test-0002.sh
>  TMPLOG=$TMP/wmi.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0002.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0002.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
>  diff $TMPLOG wmi-0002.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/wmi-0001/test-0003.sh b/wmi-0001/test-0003.sh
> index 295c024..8ca1b90 100755
> --- a/wmi-0001/test-0003.sh
> +++ b/wmi-0001/test-0003.sh
> @@ -4,7 +4,7 @@ TEST="Test wmi against known incorrect ACPI tables"
>  NAME=test-0003.sh
>  TMPLOG=$TMP/wmi.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0003.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0003.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
>  diff $TMPLOG wmi-0003.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/wmi-0001/wmi-0001.log b/wmi-0001/wmi-0001.log
> index 6f871fe..abc73e4 100644
> --- a/wmi-0001/wmi-0001.log
> +++ b/wmi-0001/wmi-0001.log
> @@ -1,6 +1,6 @@
>  wmi             Extract and analyse Windows Management Instrumentation
>  wmi             (WMI).
> -wmi             ---------------------------------------------------------
> +wmi             ----------------------------------------------------------
>  wmi             Test 1 of 2: Check Windows Management Instrumentation in
>  wmi             DSDT
>  wmi             Found WMI Object, Object ID AC, GUID:
> @@ -16,7 +16,7 @@ wmi
>  wmi             Test 2 of 2: Check Windows Management Instrumentation in
>  wmi             SSDT
>  wmi
> -wmi             =========================================================
> +wmi             ==========================================================
>  wmi             0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 2
>  wmi             info only.
> -wmi             =========================================================
> +wmi             ==========================================================
> diff --git a/wmi-0001/wmi-0002.log b/wmi-0001/wmi-0002.log
> index 1039204..49a2aeb 100644
> --- a/wmi-0001/wmi-0002.log
> +++ b/wmi-0001/wmi-0002.log
> @@ -1,6 +1,6 @@
>  wmi             Extract and analyse Windows Management Instrumentation
>  wmi             (WMI).
> -wmi             ---------------------------------------------------------
> +wmi             ----------------------------------------------------------
>  wmi             Test 1 of 2: Check Windows Management Instrumentation in
>  wmi             DSDT
>  wmi             Found WMI Object, Object ID AA, GUID:
> @@ -22,7 +22,7 @@ wmi
>  wmi             Test 2 of 2: Check Windows Management Instrumentation in
>  wmi             SSDT
>  wmi
> -wmi             =========================================================
> +wmi             ==========================================================
>  wmi             1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 1
>  wmi             info only.
> -wmi             =========================================================
> +wmi             ==========================================================
> diff --git a/wmi-0001/wmi-0003.log b/wmi-0001/wmi-0003.log
> index a9ff064..2414c6a 100644
> --- a/wmi-0001/wmi-0003.log
> +++ b/wmi-0001/wmi-0003.log
> @@ -1,6 +1,6 @@
>  wmi             Extract and analyse Windows Management Instrumentation
>  wmi             (WMI).
> -wmi             ---------------------------------------------------------
> +wmi             ----------------------------------------------------------
>  wmi             Test 1 of 2: Check Windows Management Instrumentation in
>  wmi             DSDT
>  wmi             Found WMI Object, Object ID AA, GUID:
> @@ -34,7 +34,7 @@ wmi
>  wmi             Test 2 of 2: Check Windows Management Instrumentation in
>  wmi             SSDT
>  wmi
> -wmi             =========================================================
> +wmi             ==========================================================
>  wmi             0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 1
>  wmi             info only.
> -wmi             =========================================================
> +wmi             ==========================================================
> --
> 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>
> ---
>   wmi-0001/test-0001.sh |    2 +-
>   wmi-0001/test-0002.sh |    2 +-
>   wmi-0001/test-0003.sh |    2 +-
>   wmi-0001/wmi-0001.log |    6 +++---
>   wmi-0001/wmi-0002.log |    6 +++---
>   wmi-0001/wmi-0003.log |    6 +++---
>   6 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/wmi-0001/test-0001.sh b/wmi-0001/test-0001.sh
> index 52b4ad7..10e97da 100755
> --- a/wmi-0001/test-0001.sh
> +++ b/wmi-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test wmi against known correct ACPI tables"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/wmi.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0001.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7->  $TMPLOG
>   diff $TMPLOG wmi-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/wmi-0001/test-0002.sh b/wmi-0001/test-0002.sh
> index b06dc0c..ec1dbcf 100755
> --- a/wmi-0001/test-0002.sh
> +++ b/wmi-0001/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test wmi against known correct ACPI tables"
>   NAME=test-0002.sh
>   TMPLOG=$TMP/wmi.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0002.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0002.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7->  $TMPLOG
>   diff $TMPLOG wmi-0002.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/wmi-0001/test-0003.sh b/wmi-0001/test-0003.sh
> index 295c024..8ca1b90 100755
> --- a/wmi-0001/test-0003.sh
> +++ b/wmi-0001/test-0003.sh
> @@ -4,7 +4,7 @@ TEST="Test wmi against known incorrect ACPI tables"
>   NAME=test-0003.sh
>   TMPLOG=$TMP/wmi.log.$$
>
> -$FWTS -w 80 --dumpfile=acpidump-0003.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0003.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7->  $TMPLOG
>   diff $TMPLOG wmi-0003.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/wmi-0001/wmi-0001.log b/wmi-0001/wmi-0001.log
> index 6f871fe..abc73e4 100644
> --- a/wmi-0001/wmi-0001.log
> +++ b/wmi-0001/wmi-0001.log
> @@ -1,6 +1,6 @@
>   wmi             Extract and analyse Windows Management Instrumentation
>   wmi             (WMI).
> -wmi             ---------------------------------------------------------
> +wmi             ----------------------------------------------------------
>   wmi             Test 1 of 2: Check Windows Management Instrumentation in
>   wmi             DSDT
>   wmi             Found WMI Object, Object ID AC, GUID:
> @@ -16,7 +16,7 @@ wmi
>   wmi             Test 2 of 2: Check Windows Management Instrumentation in
>   wmi             SSDT
>   wmi
> -wmi             =========================================================
> +wmi             ==========================================================
>   wmi             0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 2
>   wmi             info only.
> -wmi             =========================================================
> +wmi             ==========================================================
> diff --git a/wmi-0001/wmi-0002.log b/wmi-0001/wmi-0002.log
> index 1039204..49a2aeb 100644
> --- a/wmi-0001/wmi-0002.log
> +++ b/wmi-0001/wmi-0002.log
> @@ -1,6 +1,6 @@
>   wmi             Extract and analyse Windows Management Instrumentation
>   wmi             (WMI).
> -wmi             ---------------------------------------------------------
> +wmi             ----------------------------------------------------------
>   wmi             Test 1 of 2: Check Windows Management Instrumentation in
>   wmi             DSDT
>   wmi             Found WMI Object, Object ID AA, GUID:
> @@ -22,7 +22,7 @@ wmi
>   wmi             Test 2 of 2: Check Windows Management Instrumentation in
>   wmi             SSDT
>   wmi
> -wmi             =========================================================
> +wmi             ==========================================================
>   wmi             1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 1
>   wmi             info only.
> -wmi             =========================================================
> +wmi             ==========================================================
> diff --git a/wmi-0001/wmi-0003.log b/wmi-0001/wmi-0003.log
> index a9ff064..2414c6a 100644
> --- a/wmi-0001/wmi-0003.log
> +++ b/wmi-0001/wmi-0003.log
> @@ -1,6 +1,6 @@
>   wmi             Extract and analyse Windows Management Instrumentation
>   wmi             (WMI).
> -wmi             ---------------------------------------------------------
> +wmi             ----------------------------------------------------------
>   wmi             Test 1 of 2: Check Windows Management Instrumentation in
>   wmi             DSDT
>   wmi             Found WMI Object, Object ID AA, GUID:
> @@ -34,7 +34,7 @@ wmi
>   wmi             Test 2 of 2: Check Windows Management Instrumentation in
>   wmi             SSDT
>   wmi
> -wmi             =========================================================
> +wmi             ==========================================================
>   wmi             0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 1
>   wmi             info only.
> -wmi             =========================================================
> +wmi             ==========================================================
Acked-by: Ivan Hu<ivan.hu@canonical.com>

Patch

diff --git a/wmi-0001/test-0001.sh b/wmi-0001/test-0001.sh
index 52b4ad7..10e97da 100755
--- a/wmi-0001/test-0001.sh
+++ b/wmi-0001/test-0001.sh
@@ -4,7 +4,7 @@  TEST="Test wmi against known correct ACPI tables"
 NAME=test-0001.sh
 TMPLOG=$TMP/wmi.log.$$
 
-$FWTS -w 80 --dumpfile=acpidump-0001.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0001.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
 diff $TMPLOG wmi-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/wmi-0001/test-0002.sh b/wmi-0001/test-0002.sh
index b06dc0c..ec1dbcf 100755
--- a/wmi-0001/test-0002.sh
+++ b/wmi-0001/test-0002.sh
@@ -4,7 +4,7 @@  TEST="Test wmi against known correct ACPI tables"
 NAME=test-0002.sh
 TMPLOG=$TMP/wmi.log.$$
 
-$FWTS -w 80 --dumpfile=acpidump-0002.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0002.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
 diff $TMPLOG wmi-0002.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/wmi-0001/test-0003.sh b/wmi-0001/test-0003.sh
index 295c024..8ca1b90 100755
--- a/wmi-0001/test-0003.sh
+++ b/wmi-0001/test-0003.sh
@@ -4,7 +4,7 @@  TEST="Test wmi against known incorrect ACPI tables"
 NAME=test-0003.sh
 TMPLOG=$TMP/wmi.log.$$
 
-$FWTS -w 80 --dumpfile=acpidump-0003.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --dumpfile=acpidump-0003.log wmi - | grep "^[0-9]*[ ]*wmi" | cut -c7- > $TMPLOG
 diff $TMPLOG wmi-0003.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/wmi-0001/wmi-0001.log b/wmi-0001/wmi-0001.log
index 6f871fe..abc73e4 100644
--- a/wmi-0001/wmi-0001.log
+++ b/wmi-0001/wmi-0001.log
@@ -1,6 +1,6 @@ 
 wmi             Extract and analyse Windows Management Instrumentation
 wmi             (WMI).
-wmi             ---------------------------------------------------------
+wmi             ----------------------------------------------------------
 wmi             Test 1 of 2: Check Windows Management Instrumentation in
 wmi             DSDT
 wmi             Found WMI Object, Object ID AC, GUID:
@@ -16,7 +16,7 @@  wmi
 wmi             Test 2 of 2: Check Windows Management Instrumentation in
 wmi             SSDT
 wmi             
-wmi             =========================================================
+wmi             ==========================================================
 wmi             0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 2
 wmi             info only.
-wmi             =========================================================
+wmi             ==========================================================
diff --git a/wmi-0001/wmi-0002.log b/wmi-0001/wmi-0002.log
index 1039204..49a2aeb 100644
--- a/wmi-0001/wmi-0002.log
+++ b/wmi-0001/wmi-0002.log
@@ -1,6 +1,6 @@ 
 wmi             Extract and analyse Windows Management Instrumentation
 wmi             (WMI).
-wmi             ---------------------------------------------------------
+wmi             ----------------------------------------------------------
 wmi             Test 1 of 2: Check Windows Management Instrumentation in
 wmi             DSDT
 wmi             Found WMI Object, Object ID AA, GUID:
@@ -22,7 +22,7 @@  wmi
 wmi             Test 2 of 2: Check Windows Management Instrumentation in
 wmi             SSDT
 wmi             
-wmi             =========================================================
+wmi             ==========================================================
 wmi             1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 1
 wmi             info only.
-wmi             =========================================================
+wmi             ==========================================================
diff --git a/wmi-0001/wmi-0003.log b/wmi-0001/wmi-0003.log
index a9ff064..2414c6a 100644
--- a/wmi-0001/wmi-0003.log
+++ b/wmi-0001/wmi-0003.log
@@ -1,6 +1,6 @@ 
 wmi             Extract and analyse Windows Management Instrumentation
 wmi             (WMI).
-wmi             ---------------------------------------------------------
+wmi             ----------------------------------------------------------
 wmi             Test 1 of 2: Check Windows Management Instrumentation in
 wmi             DSDT
 wmi             Found WMI Object, Object ID AA, GUID:
@@ -34,7 +34,7 @@  wmi
 wmi             Test 2 of 2: Check Windows Management Instrumentation in
 wmi             SSDT
 wmi             
-wmi             =========================================================
+wmi             ==========================================================
 wmi             0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 1
 wmi             info only.
-wmi             =========================================================
+wmi             ==========================================================