Patchwork [22/27] arg-klog-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-23-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/159665/
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-klog-0001/klog-0001.log |    6 +++---
 arg-klog-0001/test-0001.sh  |    2 +-
 arg-klog-0001/test-0002.sh  |    2 +-
 oops-0001/oops-0001.log     |    6 +++---
 oops-0001/test-0001.sh      |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
Keng-Yu Lin - May 23, 2012, 6:57 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-klog-0001/klog-0001.log |    6 +++---
>  arg-klog-0001/test-0001.sh  |    2 +-
>  arg-klog-0001/test-0002.sh  |    2 +-
>  oops-0001/oops-0001.log     |    6 +++---
>  oops-0001/test-0001.sh      |    2 +-
>  5 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arg-klog-0001/klog-0001.log b/arg-klog-0001/klog-0001.log
> index 10d65b6..c760b19 100644
> --- a/arg-klog-0001/klog-0001.log
> +++ b/arg-klog-0001/klog-0001.log
> @@ -1,5 +1,5 @@
>  klog            Scan kernel log for errors and warnings.
> -klog            ---------------------------------------------------------
> +klog            ----------------------------------------------------------
>  klog            Test 1 of 1: Kernel log error check.
>  klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
>  klog            Kernel message: [ 0.000000] ACPI: BIOS bug: multiple APIC
> @@ -33,7 +33,7 @@ klog            that PCIe power management is not optimally configured.
>  klog
>  klog            Found 2 unique errors in kernel log.
>  klog
> -klog            =========================================================
> +klog            ==========================================================
>  klog            0 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0
>  klog            info only.
> -klog            =========================================================
> +klog            ==========================================================
> diff --git a/arg-klog-0001/test-0001.sh b/arg-klog-0001/test-0001.sh
> index 1129b44..127b8a1 100755
> --- a/arg-klog-0001/test-0001.sh
> +++ b/arg-klog-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test --klog option"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/klog.log.$$
>
> -$FWTS -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
>  diff $TMPLOG klog-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/arg-klog-0001/test-0002.sh b/arg-klog-0001/test-0002.sh
> index 73e8246..9144897 100755
> --- a/arg-klog-0001/test-0002.sh
> +++ b/arg-klog-0001/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test -k option"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/klog.log.$$
>
> -$FWTS -w 80 -k klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 -k klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
>  diff $TMPLOG klog-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/oops-0001/oops-0001.log b/oops-0001/oops-0001.log
> index 331cf15..5493827 100644
> --- a/oops-0001/oops-0001.log
> +++ b/oops-0001/oops-0001.log
> @@ -1,5 +1,5 @@
>  oops            Scan kernel log for Oopses.
> -oops            ---------------------------------------------------------
> +oops            ----------------------------------------------------------
>  oops            Test 1 of 1: Kernel log oops check.
>  oops            Found OOPS (1):
>  oops              BUG: unable to handle kernel NULL pointer dereference at (null)
> @@ -1515,7 +1515,7 @@ oops
>  oops            FAILED [CRITICAL] KernelOops: Test 1, Found 36 oopses in
>  oops            kernel log.
>  oops
> -oops            =========================================================
> +oops            ==========================================================
>  oops            0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
>  oops            info only.
> -oops            =========================================================
> +oops            ==========================================================
> diff --git a/oops-0001/test-0001.sh b/oops-0001/test-0001.sh
> index d2d8aaf..13318e1 100755
> --- a/oops-0001/test-0001.sh
> +++ b/oops-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test oops against known failure patterns"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/oops.log.$$
>
> -$FWTS -w 80 --klog=oops.txt oops - | grep "^[0-9]*[ ]*oops" | cut -c7- > $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --klog=oops.txt oops - | grep "^[0-9]*[ ]*oops" | cut -c7- > $TMPLOG
>  diff $TMPLOG oops-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>
> ---
>   arg-klog-0001/klog-0001.log |    6 +++---
>   arg-klog-0001/test-0001.sh  |    2 +-
>   arg-klog-0001/test-0002.sh  |    2 +-
>   oops-0001/oops-0001.log     |    6 +++---
>   oops-0001/test-0001.sh      |    2 +-
>   5 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arg-klog-0001/klog-0001.log b/arg-klog-0001/klog-0001.log
> index 10d65b6..c760b19 100644
> --- a/arg-klog-0001/klog-0001.log
> +++ b/arg-klog-0001/klog-0001.log
> @@ -1,5 +1,5 @@
>   klog            Scan kernel log for errors and warnings.
> -klog            ---------------------------------------------------------
> +klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
>   klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
>   klog            Kernel message: [ 0.000000] ACPI: BIOS bug: multiple APIC
> @@ -33,7 +33,7 @@ klog            that PCIe power management is not optimally configured.
>   klog
>   klog            Found 2 unique errors in kernel log.
>   klog
> -klog            =========================================================
> +klog            ==========================================================
>   klog            0 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0
>   klog            info only.
> -klog            =========================================================
> +klog            ==========================================================
> diff --git a/arg-klog-0001/test-0001.sh b/arg-klog-0001/test-0001.sh
> index 1129b44..127b8a1 100755
> --- a/arg-klog-0001/test-0001.sh
> +++ b/arg-klog-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test --klog option"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/klog.log.$$
>
> -$FWTS -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7->  $TMPLOG
>   diff $TMPLOG klog-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/arg-klog-0001/test-0002.sh b/arg-klog-0001/test-0002.sh
> index 73e8246..9144897 100755
> --- a/arg-klog-0001/test-0002.sh
> +++ b/arg-klog-0001/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test -k option"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/klog.log.$$
>
> -$FWTS -w 80 -k klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 -k klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7->  $TMPLOG
>   diff $TMPLOG klog-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/oops-0001/oops-0001.log b/oops-0001/oops-0001.log
> index 331cf15..5493827 100644
> --- a/oops-0001/oops-0001.log
> +++ b/oops-0001/oops-0001.log
> @@ -1,5 +1,5 @@
>   oops            Scan kernel log for Oopses.
> -oops            ---------------------------------------------------------
> +oops            ----------------------------------------------------------
>   oops            Test 1 of 1: Kernel log oops check.
>   oops            Found OOPS (1):
>   oops              BUG: unable to handle kernel NULL pointer dereference at (null)
> @@ -1515,7 +1515,7 @@ oops
>   oops            FAILED [CRITICAL] KernelOops: Test 1, Found 36 oopses in
>   oops            kernel log.
>   oops
> -oops            =========================================================
> +oops            ==========================================================
>   oops            0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
>   oops            info only.
> -oops            =========================================================
> +oops            ==========================================================
> diff --git a/oops-0001/test-0001.sh b/oops-0001/test-0001.sh
> index d2d8aaf..13318e1 100755
> --- a/oops-0001/test-0001.sh
> +++ b/oops-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test oops against known failure patterns"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/oops.log.$$
>
> -$FWTS -w 80 --klog=oops.txt oops - | grep "^[0-9]*[ ]*oops" | cut -c7->  $TMPLOG
> +$FWTS --log-format="%line %owner " -w 80 --klog=oops.txt oops - | grep "^[0-9]*[ ]*oops" | cut -c7->  $TMPLOG
>   diff $TMPLOG oops-0001.log>>  $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
Acked-by: Ivan Hu<ivan.hu@canonical.com>

Patch

diff --git a/arg-klog-0001/klog-0001.log b/arg-klog-0001/klog-0001.log
index 10d65b6..c760b19 100644
--- a/arg-klog-0001/klog-0001.log
+++ b/arg-klog-0001/klog-0001.log
@@ -1,5 +1,5 @@ 
 klog            Scan kernel log for errors and warnings.
-klog            ---------------------------------------------------------
+klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
 klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
 klog            Kernel message: [ 0.000000] ACPI: BIOS bug: multiple APIC
@@ -33,7 +33,7 @@  klog            that PCIe power management is not optimally configured.
 klog            
 klog            Found 2 unique errors in kernel log.
 klog            
-klog            =========================================================
+klog            ==========================================================
 klog            0 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0
 klog            info only.
-klog            =========================================================
+klog            ==========================================================
diff --git a/arg-klog-0001/test-0001.sh b/arg-klog-0001/test-0001.sh
index 1129b44..127b8a1 100755
--- a/arg-klog-0001/test-0001.sh
+++ b/arg-klog-0001/test-0001.sh
@@ -4,7 +4,7 @@  TEST="Test --klog option"
 NAME=test-0001.sh
 TMPLOG=$TMP/klog.log.$$
 
-$FWTS -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
 diff $TMPLOG klog-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/arg-klog-0001/test-0002.sh b/arg-klog-0001/test-0002.sh
index 73e8246..9144897 100755
--- a/arg-klog-0001/test-0002.sh
+++ b/arg-klog-0001/test-0002.sh
@@ -4,7 +4,7 @@  TEST="Test -k option"
 NAME=test-0001.sh
 TMPLOG=$TMP/klog.log.$$
 
-$FWTS -w 80 -k klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 -k klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
 diff $TMPLOG klog-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/oops-0001/oops-0001.log b/oops-0001/oops-0001.log
index 331cf15..5493827 100644
--- a/oops-0001/oops-0001.log
+++ b/oops-0001/oops-0001.log
@@ -1,5 +1,5 @@ 
 oops            Scan kernel log for Oopses.
-oops            ---------------------------------------------------------
+oops            ----------------------------------------------------------
 oops            Test 1 of 1: Kernel log oops check.
 oops            Found OOPS (1):
 oops              BUG: unable to handle kernel NULL pointer dereference at (null)
@@ -1515,7 +1515,7 @@  oops
 oops            FAILED [CRITICAL] KernelOops: Test 1, Found 36 oopses in
 oops            kernel log.
 oops            
-oops            =========================================================
+oops            ==========================================================
 oops            0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
 oops            info only.
-oops            =========================================================
+oops            ==========================================================
diff --git a/oops-0001/test-0001.sh b/oops-0001/test-0001.sh
index d2d8aaf..13318e1 100755
--- a/oops-0001/test-0001.sh
+++ b/oops-0001/test-0001.sh
@@ -4,7 +4,7 @@  TEST="Test oops against known failure patterns"
 NAME=test-0001.sh
 TMPLOG=$TMP/oops.log.$$
 
-$FWTS -w 80 --klog=oops.txt oops - | grep "^[0-9]*[ ]*oops" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --klog=oops.txt oops - | grep "^[0-9]*[ ]*oops" | cut -c7- > $TMPLOG
 diff $TMPLOG oops-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then