ACK: [PATCH 1/3][FWTS-TEST] tests: fix messages due to fwts commit c07bc3f5255778c2b022e6eaa338958bb26ee7cf

Alex Hung alex.hung at canonical.com
Mon Oct 7 03:09:57 UTC 2013


On 10/03/2013 06:14 PM, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> We need to sync fwts-test to match the fwts test summary info as per
> commit c07bc3f5255778c2b022e6eaa338958bb26ee7cf in fwts
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
>   acpitables-0001/acpitables-0001.log             |   2 +-
>   acpitables-0002/acpitables-0001.log             |   2 +-
>   acpitables-0002/acpitables-0002.log             |   2 +-
>   acpitables-0003/acpitables-0001.log             |   2 +-
>   acpitables-0004/acpitables-0001.log             |   2 +-
>   acpitables-0005/acpitables-0001.log             |   2 +-
>   acpitables-0006/acpitables-0001.log             |   2 +-
>   acpitables-0007/acpitables-0001.log             |   2 +-
>   acpitables-0008/acpitables-0001.log             |   2 +-
>   apicinstance-0001/apicinstance-0001.log         |   2 +-
>   apicinstance-0001/apicinstance-0002.log         |   2 +-
>   arg-json-0001/klog-0001.log                     |   2 +-
>   arg-json-0001/klog-0002.log                     |   2 +-
>   arg-json-0001/klog-0003.log                     |   2 +-
>   arg-json-0001/klog-0004.log                     |   2 +-
>   arg-klog-0001/klog-0001.log                     |   2 +-
>   arg-log-format-0001/klog-0001.log               |   2 +-
>   arg-log-format-0001/klog-0002.log               |   2 +-
>   arg-log-format-0001/klog-0003.log               |   2 +-
>   arg-log-format-0001/klog-0004.log               |   4 +-
>   arg-results-0001/results-0005.log               |   4 +-
>   arg-results-0001/results.log                    |   2 +-
>   arg-results-no-separators-0001/klog-0001.log    |   2 +-
>   arg-show-progress-dialog-0001/progress-0001.log | 192 ++++++++++++------------
>   arg-width-0001/klog-0001.log                    |   2 +-
>   arg-width-0001/klog-0002.log                    |   2 +-
>   arg-width-0001/klog-0003.log                    |   2 +-
>   arg-width-0001/klog-0004.log                    |   2 +-
>   checksum-0001/checksum-0001.log                 |   2 +-
>   checksum-0001/checksum-0003.log                 |   2 +-
>   checksum-0001/checksum-0004.log                 |   2 +-
>   klog-0001/klog-0001.log                         |   2 +-
>   klog-0001/klog-0002.log                         |   2 +-
>   klog-0002/klog-0001.log                         |   2 +-
>   klog-0002/klog-0002.log                         |   2 +-
>   method-0001/method-0001.log                     |   4 +-
>   oops-0001/oops-0001.log                         |   2 +-
>   oops-0001/oops-0002.log                         |   2 +-
>   osilinux-0001/osilinux-0001.log                 |   2 +-
>   osilinux-0001/osilinux-0002.log                 |   2 +-
>   syntaxcheck-0001/syntaxcheck-0001.log           |   2 +-
>   wmi-0001/wmi-0001.log                           |   2 +-
>   wmi-0001/wmi-0002.log                           |   2 +-
>   wmi-0001/wmi-0003.log                           |   2 +-
>   44 files changed, 142 insertions(+), 142 deletions(-)
>
> diff --git a/acpitables-0001/acpitables-0001.log b/acpitables-0001/acpitables-0001.log
> index 0d57acb..2f05d15 100644
> --- a/acpitables-0001/acpitables-0001.log
> +++ b/acpitables-0001/acpitables-0001.log
> @@ -12,6 +12,6 @@ acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
>   acpitables      ==========================================================
> -acpitables      7 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      7 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/acpitables-0002/acpitables-0001.log b/acpitables-0002/acpitables-0001.log
> index 298ae3c..042c83e 100644
> --- a/acpitables-0002/acpitables-0001.log
> +++ b/acpitables-0002/acpitables-0001.log
> @@ -12,6 +12,6 @@ acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
>   acpitables      ==========================================================
> -acpitables      4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      4 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/acpitables-0002/acpitables-0002.log b/acpitables-0002/acpitables-0002.log
> index 9c43097..db437af 100644
> --- a/acpitables-0002/acpitables-0002.log
> +++ b/acpitables-0002/acpitables-0002.log
> @@ -35,6 +35,6 @@ acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
>   acpitables      ==========================================================
> -acpitables      3 passed, 9 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      3 passed, 9 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/acpitables-0003/acpitables-0001.log b/acpitables-0003/acpitables-0001.log
> index 3e4e1bf..2a4d63e 100644
> --- a/acpitables-0003/acpitables-0001.log
> +++ b/acpitables-0003/acpitables-0001.log
> @@ -82,6 +82,6 @@ acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
>   acpitables      ==========================================================
> -acpitables      3 passed, 9 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      3 passed, 9 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/acpitables-0004/acpitables-0001.log b/acpitables-0004/acpitables-0001.log
> index 997f4a9..52491c3 100644
> --- a/acpitables-0004/acpitables-0001.log
> +++ b/acpitables-0004/acpitables-0001.log
> @@ -24,6 +24,6 @@ acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
>   acpitables      ==========================================================
> -acpitables      3 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      3 passed, 2 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/acpitables-0005/acpitables-0001.log b/acpitables-0005/acpitables-0001.log
> index 62593a9..cf09a01 100644
> --- a/acpitables-0005/acpitables-0001.log
> +++ b/acpitables-0005/acpitables-0001.log
> @@ -12,6 +12,6 @@ acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
>   acpitables      ==========================================================
> -acpitables      4 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      4 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/acpitables-0006/acpitables-0001.log b/acpitables-0006/acpitables-0001.log
> index 55209bf..1c2633c 100644
> --- a/acpitables-0006/acpitables-0001.log
> +++ b/acpitables-0006/acpitables-0001.log
> @@ -155,6 +155,6 @@ acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
>   acpitables      ==========================================================
> -acpitables      2 passed, 18 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      2 passed, 18 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/acpitables-0007/acpitables-0001.log b/acpitables-0007/acpitables-0001.log
> index 7b14dff..3e02f91 100644
> --- a/acpitables-0007/acpitables-0001.log
> +++ b/acpitables-0007/acpitables-0001.log
> @@ -123,6 +123,6 @@ acpitables      ignore this. However, it should be fixed where possible.
>   acpitables
>   acpitables
>   acpitables      ==========================================================
> -acpitables      2 passed, 14 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      2 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/acpitables-0008/acpitables-0001.log b/acpitables-0008/acpitables-0001.log
> index 3321391..1a127a6 100644
> --- a/acpitables-0008/acpitables-0001.log
> +++ b/acpitables-0008/acpitables-0001.log
> @@ -12,6 +12,6 @@ acpitables      Table SBST not present to check.
>   acpitables      PASSED: Test 1, Table XSDT passed.
>   acpitables
>   acpitables      ==========================================================
> -acpitables      3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +acpitables      3 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   acpitables      info only.
>   acpitables      ==========================================================
> diff --git a/apicinstance-0001/apicinstance-0001.log b/apicinstance-0001/apicinstance-0001.log
> index 092f10d..a185d24 100644
> --- a/apicinstance-0001/apicinstance-0001.log
> +++ b/apicinstance-0001/apicinstance-0001.log
> @@ -11,6 +11,6 @@ apicinstance    If you find any APIC issues, perhaps try using
>   apicinstance    acpi_apic_instance=2.
>   apicinstance
>   apicinstance    ==========================================================
> -apicinstance    0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +apicinstance    0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
>   apicinstance    info only.
>   apicinstance    ==========================================================
> diff --git a/apicinstance-0001/apicinstance-0002.log b/apicinstance-0001/apicinstance-0002.log
> index c880cf8..91fd42e 100644
> --- a/apicinstance-0001/apicinstance-0002.log
> +++ b/apicinstance-0001/apicinstance-0002.log
> @@ -6,6 +6,6 @@ apicinstance    Found APIC/MADT table APIC @ bf6dfcc6, length 0x104
>   apicinstance    PASSED: Test 1, Found 1 APIC/MADT table(s), as expected.
>   apicinstance
>   apicinstance    ==========================================================
> -apicinstance    1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +apicinstance    1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   apicinstance    info only.
>   apicinstance    ==========================================================
> diff --git a/arg-json-0001/klog-0001.log b/arg-json-0001/klog-0001.log
> index 3947f3d..74e6d53 100644
> --- a/arg-json-0001/klog-0001.log
> +++ b/arg-json-0001/klog-0001.log
> @@ -24,6 +24,6 @@ klog
>   klog            Found 1 unique errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/arg-json-0001/klog-0002.log b/arg-json-0001/klog-0002.log
> index 3947f3d..74e6d53 100644
> --- a/arg-json-0001/klog-0002.log
> +++ b/arg-json-0001/klog-0002.log
> @@ -24,6 +24,6 @@ klog
>   klog            Found 1 unique errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/arg-json-0001/klog-0003.log b/arg-json-0001/klog-0003.log
> index 33b5e2e..2274535 100644
> --- a/arg-json-0001/klog-0003.log
> +++ b/arg-json-0001/klog-0003.log
> @@ -5,6 +5,6 @@ klog            Cannot read file /xxxx/fooo/klog.json.
>   klog            Error parsing kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/arg-json-0001/klog-0004.log b/arg-json-0001/klog-0004.log
> index 33b5e2e..2274535 100644
> --- a/arg-json-0001/klog-0004.log
> +++ b/arg-json-0001/klog-0004.log
> @@ -5,6 +5,6 @@ klog            Cannot read file /xxxx/fooo/klog.json.
>   klog            Error parsing kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/arg-klog-0001/klog-0001.log b/arg-klog-0001/klog-0001.log
> index 2849439..8f4a2ec 100644
> --- a/arg-klog-0001/klog-0001.log
> +++ b/arg-klog-0001/klog-0001.log
> @@ -43,6 +43,6 @@ klog
>   klog            Found 3 unique errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/arg-log-format-0001/klog-0001.log b/arg-log-format-0001/klog-0001.log
> index a383e87..7c5b81a 100644
> --- a/arg-log-format-0001/klog-0001.log
> +++ b/arg-log-format-0001/klog-0001.log
> @@ -270,6 +270,6 @@ klog            (00287) <16/05/12> NLN  :
>   klog            (00288) <16/05/12> INF  : Found 18 unique errors in kernel log.
>   klog            (00289) <16/05/12> NLN  :
>   klog            (00290) <16/05/12> SEP  : ======================================
> -klog            (00291) <16/05/12> SUM  : 0 passed, 18 failed, 0 warnings, 0
> +klog            (00291) <16/05/12> SUM  : 0 passed, 18 failed, 0 warning, 0
>   klog            (00292) <16/05/12> SUM  : aborted, 0 skipped, 0 info only.
>   klog            (00293) <16/05/12> SEP  : ======================================
> diff --git a/arg-log-format-0001/klog-0002.log b/arg-log-format-0001/klog-0002.log
> index 9a9fdf8..cb74c1f 100644
> --- a/arg-log-format-0001/klog-0002.log
> +++ b/arg-log-format-0001/klog-0002.log
> @@ -179,6 +179,6 @@ klog           :
>   klog           : Found 18 unique errors in kernel log.
>   klog           :
>   klog           : ===============================================================
> -klog           : 0 passed, 18 failed, 0 warnings, 0 aborted, 0 skipped, 0 info
> +klog           : 0 passed, 18 failed, 0 warning, 0 aborted, 0 skipped, 0 info
>   klog           : only.
>   klog           : ===============================================================
> diff --git a/arg-log-format-0001/klog-0003.log b/arg-log-format-0001/klog-0003.log
> index 7878a8a..13b48c2 100644
> --- a/arg-log-format-0001/klog-0003.log
> +++ b/arg-log-format-0001/klog-0003.log
> @@ -192,6 +192,6 @@ klog            00205:
>   klog            00206: Found 18 unique errors in kernel log.
>   klog            00207:
>   klog            00208: =========================================================
> -klog            00209: 0 passed, 18 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            00209: 0 passed, 18 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            00210: info only.
>   klog            00211: =========================================================
> diff --git a/arg-log-format-0001/klog-0004.log b/arg-log-format-0001/klog-0004.log
> index 32c3a87..80ae876 100644
> --- a/arg-log-format-0001/klog-0004.log
> +++ b/arg-log-format-0001/klog-0004.log
> @@ -208,6 +208,6 @@ klog            10/10/11  :
>   klog            10/10/11  : Found 18 unique errors in kernel log.
>   klog            10/10/11  :
>   klog            10/10/11  : ====================================================
> -klog            10/10/11  : 0 passed, 18 failed, 0 warnings, 0 aborted, 0
> -klog            10/10/11  : skipped, 0 info only.
> +klog            10/10/11  : 0 passed, 18 failed, 0 warning, 0 aborted, 0 skipped
> +klog            10/10/11  : , 0 info only.
>   klog            10/10/11  : ====================================================
> diff --git a/arg-results-0001/results-0005.log b/arg-results-0001/results-0005.log
> index e4d2027..f4011a3 100644
> --- a/arg-results-0001/results-0005.log
> +++ b/arg-results-0001/results-0005.log
> @@ -43,7 +43,7 @@ klog
>   klog            Found 3 unique errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
>   klog            klog: Scan kernel log for errors and warnings.
> @@ -91,6 +91,6 @@ klog
>   klog            Found 3 unique errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/arg-results-0001/results.log b/arg-results-0001/results.log
> index 2849439..8f4a2ec 100644
> --- a/arg-results-0001/results.log
> +++ b/arg-results-0001/results.log
> @@ -43,6 +43,6 @@ klog
>   klog            Found 3 unique errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/arg-results-no-separators-0001/klog-0001.log b/arg-results-no-separators-0001/klog-0001.log
> index 9679001..e8679c6 100644
> --- a/arg-results-no-separators-0001/klog-0001.log
> +++ b/arg-results-no-separators-0001/klog-0001.log
> @@ -41,5 +41,5 @@ klog            should be disabled for kernels > 2.6.37.
>   klog
>   klog            Found 3 unique errors in kernel log.
>   klog
> -klog            0 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
> diff --git a/arg-show-progress-dialog-0001/progress-0001.log b/arg-show-progress-dialog-0001/progress-0001.log
> index 443d056..eeebf51 100644
> --- a/arg-show-progress-dialog-0001/progress-0001.log
> +++ b/arg-show-progress-dialog-0001/progress-0001.log
> @@ -1,7 +1,7 @@
>   Running 3 tests, results appended to results.log
>   XXX
>   0
> -So far: 0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 0 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for Oopses.
>
> @@ -9,7 +9,7 @@ Running test #1:
>   XXX
>   XXX
>   0
> -So far: 0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 0 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for Oopses.
>
> @@ -17,7 +17,7 @@ Running test #1: Kernel log oops check.
>   XXX
>   XXX
>   33
> -So far: 0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 0 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for Oopses.
>
> @@ -25,7 +25,7 @@ Running test #1: Kernel log oops check.
>   XXX
>   XXX
>   33
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -33,7 +33,7 @@ Running test #2:
>   XXX
>   XXX
>   33
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -41,7 +41,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   33
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -49,7 +49,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   33
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -57,7 +57,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   34
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -65,7 +65,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   34
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -73,7 +73,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   34
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -81,7 +81,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   35
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -89,7 +89,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   35
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -97,7 +97,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   36
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -105,7 +105,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   36
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -113,7 +113,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   36
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -121,7 +121,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   37
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -129,7 +129,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   37
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -137,7 +137,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   38
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -145,7 +145,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   38
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -153,7 +153,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   38
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -161,7 +161,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   39
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -169,7 +169,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   39
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -177,7 +177,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   39
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -185,7 +185,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   40
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -193,7 +193,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   40
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -201,7 +201,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   41
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -209,7 +209,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   41
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -217,7 +217,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   41
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -225,7 +225,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   42
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -233,7 +233,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   42
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -241,7 +241,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   43
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -249,7 +249,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   43
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -257,7 +257,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   43
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -265,7 +265,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   44
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -273,7 +273,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   44
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -281,7 +281,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   45
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -289,7 +289,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   45
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -297,7 +297,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   45
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -305,7 +305,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   46
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -313,7 +313,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   46
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -321,7 +321,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   47
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -329,7 +329,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   47
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -337,7 +337,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   47
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -345,7 +345,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   48
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -353,7 +353,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   48
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -361,7 +361,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   49
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -369,7 +369,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   49
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -377,7 +377,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   49
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -385,7 +385,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   33
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -393,7 +393,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   33
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -401,7 +401,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   34
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -409,7 +409,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   34
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -417,7 +417,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   35
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -425,7 +425,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   35
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -433,7 +433,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   36
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -441,7 +441,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   36
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -449,7 +449,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   37
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -457,7 +457,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   37
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -465,7 +465,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   37
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -473,7 +473,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   38
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -481,7 +481,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   38
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -489,7 +489,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   39
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -497,7 +497,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   39
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -505,7 +505,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   40
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -513,7 +513,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   40
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -521,7 +521,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   41
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -529,7 +529,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   41
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -537,7 +537,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   42
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -545,7 +545,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   42
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -553,7 +553,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   43
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -561,7 +561,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   43
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -569,7 +569,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   43
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -577,7 +577,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   44
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -585,7 +585,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   44
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -593,7 +593,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   45
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -601,7 +601,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   45
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -609,7 +609,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   46
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -617,7 +617,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   46
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -625,7 +625,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   47
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -633,7 +633,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   47
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -641,7 +641,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   48
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -649,7 +649,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   48
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -657,7 +657,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   49
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -665,7 +665,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   49
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -673,7 +673,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   49
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -681,7 +681,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   66
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -689,7 +689,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   66
> -So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Scan kernel log for errors and warnings.
>
> @@ -697,7 +697,7 @@ Running test #2: Kernel log error check.
>   XXX
>   XXX
>   66
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -705,7 +705,7 @@ Running test #3:
>   XXX
>   XXX
>   66
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -713,7 +713,7 @@ Running test #3: Gather kernel signature.
>   XXX
>   XXX
>   75
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -721,7 +721,7 @@ Running test #3: Gather kernel signature.
>   XXX
>   XXX
>   75
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -729,7 +729,7 @@ Running test #3: Gather kernel system information.
>   XXX
>   XXX
>   83
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -737,7 +737,7 @@ Running test #3: Gather kernel system information.
>   XXX
>   XXX
>   83
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -745,7 +745,7 @@ Running test #3: Gather kernel boot command line.
>   XXX
>   XXX
>   91
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -753,7 +753,7 @@ Running test #3: Gather kernel boot command line.
>   XXX
>   XXX
>   91
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -761,7 +761,7 @@ Running test #3: Gather ACPI driver version.
>   XXX
>   XXX
>   100
> -So far: 2 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> diff --git a/arg-width-0001/klog-0001.log b/arg-width-0001/klog-0001.log
> index 6e4983d..04e550c 100644
> --- a/arg-width-0001/klog-0001.log
> +++ b/arg-width-0001/klog-0001.log
> @@ -4,6 +4,6 @@ klog            Test 1 of 1: Kernel log error check.
>   klog            PASSED: Test 1, Found no errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/arg-width-0001/klog-0002.log b/arg-width-0001/klog-0002.log
> index 2199c13..eb73516 100644
> --- a/arg-width-0001/klog-0002.log
> +++ b/arg-width-0001/klog-0002.log
> @@ -4,5 +4,5 @@ klog            Test 1 of 1: Kernel log error check.
>   klog            PASSED: Test 1, Found no errors in kernel log.
>   klog
>   klog            ====================================================================
> -klog            1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> +klog            1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only.
>   klog            ====================================================================
> diff --git a/arg-width-0001/klog-0003.log b/arg-width-0001/klog-0003.log
> index 4a26261..614b6e3 100644
> --- a/arg-width-0001/klog-0003.log
> +++ b/arg-width-0001/klog-0003.log
> @@ -4,5 +4,5 @@ klog            Test 1 of 1: Kernel log error check.
>   klog            PASSED: Test 1, Found no errors in kernel log.
>   klog
>   klog            ==============================================================================
> -klog            1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> +klog            1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only.
>   klog            ==============================================================================
> diff --git a/arg-width-0001/klog-0004.log b/arg-width-0001/klog-0004.log
> index 390d142..e7ae50a 100644
> --- a/arg-width-0001/klog-0004.log
> +++ b/arg-width-0001/klog-0004.log
> @@ -4,5 +4,5 @@ klog            Test 1 of 1: Kernel log error check.
>   klog            PASSED: Test 1, Found no errors in kernel log.
>   klog
>   klog            =============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
>   =====
> -klog            1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> +klog            1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only.
>   klog            =============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
>   =====
> diff --git a/checksum-0001/checksum-0001.log b/checksum-0001/checksum-0001.log
> index 7bb324d..4efca9b 100644
> --- a/checksum-0001/checksum-0001.log
> +++ b/checksum-0001/checksum-0001.log
> @@ -20,5 +20,5 @@ checksum        PASSED: Test 1, Table XSDT has correct checksum 0xc2.
>   checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>   checksum
>   checksum        ==================================================================================================
> -checksum        19 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> +checksum        19 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 info only.
>   checksum        ==================================================================================================
> diff --git a/checksum-0001/checksum-0003.log b/checksum-0001/checksum-0003.log
> index 367168e..75925bb 100644
> --- a/checksum-0001/checksum-0003.log
> +++ b/checksum-0001/checksum-0003.log
> @@ -26,5 +26,5 @@ checksum        PASSED: Test 1, Table XSDT has correct checksum 0xc2.
>   checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>   checksum
>   checksum        ==================================================================================================
> -checksum        18 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> +checksum        18 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0 info only.
>   checksum        ==================================================================================================
> diff --git a/checksum-0001/checksum-0004.log b/checksum-0001/checksum-0004.log
> index bf22906..d092674 100644
> --- a/checksum-0001/checksum-0004.log
> +++ b/checksum-0001/checksum-0004.log
> @@ -110,5 +110,5 @@ checksum
>   checksum        PASSED: Test 1, Table RSDT has correct checksum 0xd.
>   checksum
>   checksum        ==================================================================================================
> -checksum        4 passed, 15 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> +checksum        4 passed, 15 failed, 0 warning, 0 aborted, 0 skipped, 0 info only.
>   checksum        ==================================================================================================
> diff --git a/klog-0001/klog-0001.log b/klog-0001/klog-0001.log
> index f2da037..5cbcbca 100644
> --- a/klog-0001/klog-0001.log
> +++ b/klog-0001/klog-0001.log
> @@ -15137,6 +15137,6 @@ klog
>   klog            Found 1589 unique errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 1589 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 1589 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/klog-0001/klog-0002.log b/klog-0001/klog-0002.log
> index 43e8c1b..b6cd3c7 100644
> --- a/klog-0001/klog-0002.log
> +++ b/klog-0001/klog-0002.log
> @@ -1,5 +1,5 @@
>   summary
> -summary         0 passed, 1589 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +summary         0 passed, 1589 failed, 0 warning, 0 aborted, 0 skipped, 0
>   summary         info only.
>   summary
>   summary         Test Failure Summary
> diff --git a/klog-0002/klog-0001.log b/klog-0002/klog-0001.log
> index 10fd3eb..89f1468 100644
> --- a/klog-0002/klog-0001.log
> +++ b/klog-0002/klog-0001.log
> @@ -76,6 +76,6 @@ klog
>   klog            Found 11 unique errors in kernel log.
>   klog
>   klog            ==========================================================
> -klog            0 passed, 11 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +klog            0 passed, 11 failed, 0 warning, 0 aborted, 0 skipped, 0
>   klog            info only.
>   klog            ==========================================================
> diff --git a/klog-0002/klog-0002.log b/klog-0002/klog-0002.log
> index e827cac..7bd84e2 100644
> --- a/klog-0002/klog-0002.log
> +++ b/klog-0002/klog-0002.log
> @@ -1,5 +1,5 @@
>   summary
> -summary         0 passed, 11 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +summary         0 passed, 11 failed, 0 warning, 0 aborted, 0 skipped, 0
>   summary         info only.
>   summary
>   summary         Test Failure Summary
> diff --git a/method-0001/method-0001.log b/method-0001/method-0001.log
> index 1c941f5..e41aa26 100644
> --- a/method-0001/method-0001.log
> +++ b/method-0001/method-0001.log
> @@ -1083,6 +1083,6 @@ method          SKIPPED: Test 144, Skipping test for non-existant object
>   method          _VPO.
>   method
>   method          ==========================================================
> -method          232 passed, 0 failed, 0 warnings, 0 aborted, 112 skipped,
> -method          0 info only.
> +method          232 passed, 0 failed, 0 warning, 0 aborted, 112 skipped, 0
> +method          info only.
>   method          ==========================================================
> diff --git a/oops-0001/oops-0001.log b/oops-0001/oops-0001.log
> index 87f2a72..3214792 100644
> --- a/oops-0001/oops-0001.log
> +++ b/oops-0001/oops-0001.log
> @@ -1541,6 +1541,6 @@ oops            FAILED [HIGH] KernelWarnOns: Test 1, Found 1 WARN_ON
>   oops            warnings in kernel log.
>   oops
>   oops            ==========================================================
> -oops            0 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +oops            0 passed, 2 failed, 0 warning, 0 aborted, 0 skipped, 0
>   oops            info only.
>   oops            ==========================================================
> diff --git a/oops-0001/oops-0002.log b/oops-0001/oops-0002.log
> index 05ce4f4..10a7e73 100644
> --- a/oops-0001/oops-0002.log
> +++ b/oops-0001/oops-0002.log
> @@ -1,5 +1,5 @@
>   summary
> -summary         0 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only.
> +summary         0 passed, 2 failed, 0 warning, 0 aborted, 0 skipped, 0 info only.
>   summary
>   summary         Test Failure Summary
>   summary         ==========================================================================================================================================================================================================================================================================================================================================================================================
> diff --git a/osilinux-0001/osilinux-0001.log b/osilinux-0001/osilinux-0001.log
> index bcd8797..d504a7c 100644
> --- a/osilinux-0001/osilinux-0001.log
> +++ b/osilinux-0001/osilinux-0001.log
> @@ -32,6 +32,6 @@ osilinux        WARNING: Test 1, DSDT implements a deprecated
>   osilinux        _OSI("Linux") test.
>   osilinux
>   osilinux        ==========================================================
> -osilinux        0 passed, 0 failed, 1 warnings, 0 aborted, 0 skipped, 0
> +osilinux        0 passed, 0 failed, 1 warning, 0 aborted, 0 skipped, 0
>   osilinux        info only.
>   osilinux        ==========================================================
> diff --git a/osilinux-0001/osilinux-0002.log b/osilinux-0001/osilinux-0002.log
> index 060f22b..a2805ee 100644
> --- a/osilinux-0001/osilinux-0002.log
> +++ b/osilinux-0001/osilinux-0002.log
> @@ -9,6 +9,6 @@ osilinux        PASSED: Test 1, DSDT does not implement a deprecated
>   osilinux        _OSI("Linux") test.
>   osilinux
>   osilinux        ==========================================================
> -osilinux        1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +osilinux        1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   osilinux        info only.
>   osilinux        ==========================================================
> diff --git a/syntaxcheck-0001/syntaxcheck-0001.log b/syntaxcheck-0001/syntaxcheck-0001.log
> index 43030de..66cfeeb 100644
> --- a/syntaxcheck-0001/syntaxcheck-0001.log
> +++ b/syntaxcheck-0001/syntaxcheck-0001.log
> @@ -106,6 +106,6 @@ syntaxcheck     warnings.
>   syntaxcheck
>   syntaxcheck
>   syntaxcheck     ==========================================================
> -syntaxcheck     5 passed, 3 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +syntaxcheck     5 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
>   syntaxcheck     info only.
>   syntaxcheck     ==========================================================
> diff --git a/wmi-0001/wmi-0001.log b/wmi-0001/wmi-0001.log
> index 6e34ba2..0540ba3 100644
> --- a/wmi-0001/wmi-0001.log
> +++ b/wmi-0001/wmi-0001.log
> @@ -118,6 +118,6 @@ wmi                 Object ID      : BB
>   wmi                 Instance       : 0x01
>   wmi
>   wmi             ==========================================================
> -wmi             8 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +wmi             8 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   wmi             info only.
>   wmi             ==========================================================
> diff --git a/wmi-0001/wmi-0002.log b/wmi-0001/wmi-0002.log
> index 33840d0..ab5b704 100644
> --- a/wmi-0001/wmi-0002.log
> +++ b/wmi-0001/wmi-0002.log
> @@ -32,6 +32,6 @@ wmi             , handler, NULL). http://lwn.net/Articles/391230 describes
>   wmi             how to write an appropriate driver.
>   wmi
>   wmi             ==========================================================
> -wmi             1 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +wmi             1 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
>   wmi             info only.
>   wmi             ==========================================================
> diff --git a/wmi-0001/wmi-0003.log b/wmi-0001/wmi-0003.log
> index 8062d30..5f4084d 100644
> --- a/wmi-0001/wmi-0003.log
> +++ b/wmi-0001/wmi-0003.log
> @@ -54,6 +54,6 @@ wmi             PASSED: Test 1, All events associated with \_SB_.AMW0._WDG
>   wmi             are handled by a kernel driver.
>   wmi
>   wmi             ==========================================================
> -wmi             3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
> +wmi             3 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
>   wmi             info only.
>   wmi             ==========================================================
>

Acked-by: Alex Hung <alex.hung at canonical.com>



More information about the fwts-devel mailing list