Patchwork [3/9,FWTS-TEST] arg-show-progress-dialog-0001: remove dmesg_common, replace with klog test

login
register
mail settings
Submitter Colin King
Date Dec. 17, 2012, 10:57 a.m.
Message ID <1355741836-31729-4-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/206818/
State Accepted
Headers show

Comments

Colin King - Dec. 17, 2012, 10:57 a.m.
From: Colin Ian King <colin.king@canonical.com>

Recent version of fwts has removed the dmesg_common test, so instead use
klog test and fix up the results for this test apropriately.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arg-show-progress-dialog-0001/progress-0001.log | 672 +++++++++++++++++++++++-
 arg-show-progress-dialog-0001/test-0001.sh      |   2 +-
 arg-show-progress-dialog-0001/test-0002.sh      |   2 +-
 3 files changed, 662 insertions(+), 14 deletions(-)
Keng-Yu Lin - Dec. 18, 2012, 1:40 a.m.
On Mon, Dec 17, 2012 at 6:57 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Recent version of fwts has removed the dmesg_common test, so instead use
> klog test and fix up the results for this test apropriately.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  arg-show-progress-dialog-0001/progress-0001.log | 672 +++++++++++++++++++++++-
>  arg-show-progress-dialog-0001/test-0001.sh      |   2 +-
>  arg-show-progress-dialog-0001/test-0002.sh      |   2 +-
>  3 files changed, 662 insertions(+), 14 deletions(-)
>
> diff --git a/arg-show-progress-dialog-0001/progress-0001.log b/arg-show-progress-dialog-0001/progress-0001.log
> index 7e58311..7bc5d3f 100644
> --- a/arg-show-progress-dialog-0001/progress-0001.log
> +++ b/arg-show-progress-dialog-0001/progress-0001.log
> @@ -27,7 +27,7 @@ XXX
>  33
>  So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
> -General dmesg common errors check.
> +Scan kernel log for errors and warnings.
>
>  Running test #2:
>  XXX
> @@ -35,21 +35,669 @@ XXX
>  33
>  So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
> -General dmesg common errors check.
> +Scan kernel log for errors and warnings.
>
> -Running test #2: Check common errors in kernel log.
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
>
> -General dmesg common errors check.
> +Scan kernel log for errors and warnings.
>
> -Running test #2: Check common errors in kernel log.
> +Running test #2: Kernel log error check.
>  XXX
>  XXX
>  66
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>  Gather kernel system information.
>
> @@ -57,7 +705,7 @@ Running test #3:
>  XXX
>  XXX
>  66
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>  Gather kernel system information.
>
> @@ -65,7 +713,7 @@ Running test #3: Gather kernel signature.
>  XXX
>  XXX
>  77
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>  Gather kernel system information.
>
> @@ -73,7 +721,7 @@ Running test #3: Gather kernel signature.
>  XXX
>  XXX
>  77
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>  Gather kernel system information.
>
> @@ -81,7 +729,7 @@ Running test #3: Gather kernel system information.
>  XXX
>  XXX
>  88
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>  Gather kernel system information.
>
> @@ -89,7 +737,7 @@ Running test #3: Gather kernel system information.
>  XXX
>  XXX
>  88
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>  Gather kernel system information.
>
> @@ -97,7 +745,7 @@ Running test #3: Gather APCI driver version.
>  XXX
>  XXX
>  100
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>  Gather kernel system information.
>
> diff --git a/arg-show-progress-dialog-0001/test-0001.sh b/arg-show-progress-dialog-0001/test-0001.sh
> index c5f05ba..74b654d 100755
> --- a/arg-show-progress-dialog-0001/test-0001.sh
> +++ b/arg-show-progress-dialog-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test --show-progress-dialog option"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/progress.log.$$
>
> -$FWTS -w 80 --show-progress-dialog --klog=klog.txt oops dmesg_common version > $TMPLOG
> +$FWTS -w 80 --show-progress-dialog --klog=klog.txt oops klog version > $TMPLOG
>  diff $TMPLOG progress-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> diff --git a/arg-show-progress-dialog-0001/test-0002.sh b/arg-show-progress-dialog-0001/test-0002.sh
> index 42840bb..22b7b5d 100755
> --- a/arg-show-progress-dialog-0001/test-0002.sh
> +++ b/arg-show-progress-dialog-0001/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test -D option"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/progress.log.$$
>
> -$FWTS -w 80 -D --klog=klog.txt oops dmesg_common version > $TMPLOG
> +$FWTS -w 80 -D --klog=klog.txt oops klog version > $TMPLOG
>  diff $TMPLOG progress-0001.log >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
> --
> 1.8.0
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Ivan Hu - Dec. 20, 2012, 5:45 a.m.
On 12/17/2012 06:57 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Recent version of fwts has removed the dmesg_common test, so instead use
> klog test and fix up the results for this test apropriately.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   arg-show-progress-dialog-0001/progress-0001.log | 672 +++++++++++++++++++++++-
>   arg-show-progress-dialog-0001/test-0001.sh      |   2 +-
>   arg-show-progress-dialog-0001/test-0002.sh      |   2 +-
>   3 files changed, 662 insertions(+), 14 deletions(-)
>
> diff --git a/arg-show-progress-dialog-0001/progress-0001.log b/arg-show-progress-dialog-0001/progress-0001.log
> index 7e58311..7bc5d3f 100644
> --- a/arg-show-progress-dialog-0001/progress-0001.log
> +++ b/arg-show-progress-dialog-0001/progress-0001.log
> @@ -27,7 +27,7 @@ XXX
>   33
>   So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
> -General dmesg common errors check.
> +Scan kernel log for errors and warnings.
>
>   Running test #2:
>   XXX
> @@ -35,21 +35,669 @@ XXX
>   33
>   So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
> -General dmesg common errors check.
> +Scan kernel log for errors and warnings.
>
> -Running test #2: Check common errors in kernel log.
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
> +
> +Scan kernel log for errors and warnings.
> +
> +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
>
> -General dmesg common errors check.
> +Scan kernel log for errors and warnings.
>
> -Running test #2: Check common errors in kernel log.
> +Running test #2: Kernel log error check.
>   XXX
>   XXX
>   66
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -57,7 +705,7 @@ Running test #3:
>   XXX
>   XXX
>   66
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -65,7 +713,7 @@ Running test #3: Gather kernel signature.
>   XXX
>   XXX
>   77
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -73,7 +721,7 @@ Running test #3: Gather kernel signature.
>   XXX
>   XXX
>   77
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -81,7 +729,7 @@ Running test #3: Gather kernel system information.
>   XXX
>   XXX
>   88
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -89,7 +737,7 @@ Running test #3: Gather kernel system information.
>   XXX
>   XXX
>   88
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> @@ -97,7 +745,7 @@ Running test #3: Gather APCI driver version.
>   XXX
>   XXX
>   100
> -So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
> +So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
>
>   Gather kernel system information.
>
> diff --git a/arg-show-progress-dialog-0001/test-0001.sh b/arg-show-progress-dialog-0001/test-0001.sh
> index c5f05ba..74b654d 100755
> --- a/arg-show-progress-dialog-0001/test-0001.sh
> +++ b/arg-show-progress-dialog-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test --show-progress-dialog option"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/progress.log.$$
>
> -$FWTS -w 80 --show-progress-dialog --klog=klog.txt oops dmesg_common version > $TMPLOG
> +$FWTS -w 80 --show-progress-dialog --klog=klog.txt oops klog version > $TMPLOG
>   diff $TMPLOG progress-0001.log >> $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
> diff --git a/arg-show-progress-dialog-0001/test-0002.sh b/arg-show-progress-dialog-0001/test-0002.sh
> index 42840bb..22b7b5d 100755
> --- a/arg-show-progress-dialog-0001/test-0002.sh
> +++ b/arg-show-progress-dialog-0001/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test -D option"
>   NAME=test-0001.sh
>   TMPLOG=$TMP/progress.log.$$
>
> -$FWTS -w 80 -D --klog=klog.txt oops dmesg_common version > $TMPLOG
> +$FWTS -w 80 -D --klog=klog.txt oops klog version > $TMPLOG
>   diff $TMPLOG progress-0001.log >> $FAILURE_LOG
>   ret=$?
>   if [ $ret -eq 0 ]; then
>
Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch

diff --git a/arg-show-progress-dialog-0001/progress-0001.log b/arg-show-progress-dialog-0001/progress-0001.log
index 7e58311..7bc5d3f 100644
--- a/arg-show-progress-dialog-0001/progress-0001.log
+++ b/arg-show-progress-dialog-0001/progress-0001.log
@@ -27,7 +27,7 @@  XXX
 33
 So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
-General dmesg common errors check.
+Scan kernel log for errors and warnings.
 
 Running test #2: 
 XXX
@@ -35,21 +35,669 @@  XXX
 33
 So far: 2 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
-General dmesg common errors check.
+Scan kernel log for errors and warnings.
 
-Running test #2: Check common errors in kernel log.
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
+
+Scan kernel log for errors and warnings.
+
+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
 
-General dmesg common errors check.
+Scan kernel log for errors and warnings.
 
-Running test #2: Check common errors in kernel log.
+Running test #2: Kernel log error check.
 XXX
 XXX
 66
-So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
+So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
 Gather kernel system information.
 
@@ -57,7 +705,7 @@  Running test #3:
 XXX
 XXX
 66
-So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
+So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
 Gather kernel system information.
 
@@ -65,7 +713,7 @@  Running test #3: Gather kernel signature.
 XXX
 XXX
 77
-So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
+So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
 Gather kernel system information.
 
@@ -73,7 +721,7 @@  Running test #3: Gather kernel signature.
 XXX
 XXX
 77
-So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
+So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
 Gather kernel system information.
 
@@ -81,7 +729,7 @@  Running test #3: Gather kernel system information.
 XXX
 XXX
 88
-So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
+So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
 Gather kernel system information.
 
@@ -89,7 +737,7 @@  Running test #3: Gather kernel system information.
 XXX
 XXX
 88
-So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
+So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
 Gather kernel system information.
 
@@ -97,7 +745,7 @@  Running test #3: Gather APCI driver version.
 XXX
 XXX
 100
-So far: 3 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
+So far: 2 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only
 
 Gather kernel system information.
 
diff --git a/arg-show-progress-dialog-0001/test-0001.sh b/arg-show-progress-dialog-0001/test-0001.sh
index c5f05ba..74b654d 100755
--- a/arg-show-progress-dialog-0001/test-0001.sh
+++ b/arg-show-progress-dialog-0001/test-0001.sh
@@ -4,7 +4,7 @@  TEST="Test --show-progress-dialog option"
 NAME=test-0001.sh
 TMPLOG=$TMP/progress.log.$$
 
-$FWTS -w 80 --show-progress-dialog --klog=klog.txt oops dmesg_common version > $TMPLOG
+$FWTS -w 80 --show-progress-dialog --klog=klog.txt oops klog version > $TMPLOG
 diff $TMPLOG progress-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
diff --git a/arg-show-progress-dialog-0001/test-0002.sh b/arg-show-progress-dialog-0001/test-0002.sh
index 42840bb..22b7b5d 100755
--- a/arg-show-progress-dialog-0001/test-0002.sh
+++ b/arg-show-progress-dialog-0001/test-0002.sh
@@ -4,7 +4,7 @@  TEST="Test -D option"
 NAME=test-0001.sh
 TMPLOG=$TMP/progress.log.$$
 
-$FWTS -w 80 -D --klog=klog.txt oops dmesg_common version > $TMPLOG
+$FWTS -w 80 -D --klog=klog.txt oops klog version > $TMPLOG
 diff $TMPLOG progress-0001.log >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then