Patchwork [1/3] dmesg_common-0002.log: fix line number shift

login
register
mail settings
Submitter Keng-Yu Lin
Date Feb. 2, 2012, 8:48 a.m.
Message ID <1328172537-9620-1-git-send-email-kengyu@canonical.com>
Download mbox | patch
Permalink /patch/139091/
State Rejected
Headers show

Comments

Keng-Yu Lin - Feb. 2, 2012, 8:48 a.m.
Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
---
 dmesg_common-0001/dmesg_common-0002.log |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
Colin King - Feb. 2, 2012, 10:51 a.m.
On 02/02/12 08:48, Keng-Yu Lin wrote:
> Signed-off-by: Keng-Yu Lin<kengyu@canonical.com>
> ---
>   dmesg_common-0001/dmesg_common-0002.log |   22 +++++++++++-----------
>   1 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/dmesg_common-0001/dmesg_common-0002.log b/dmesg_common-0001/dmesg_common-0002.log
> index b24dc41..0a501b3 100644
> --- a/dmesg_common-0001/dmesg_common-0002.log
> +++ b/dmesg_common-0001/dmesg_common-0002.log
> @@ -6,27 +6,27 @@ summary         Test Failure Summary
>   summary         ====================
>   summary
>   summary         Critical failures: 11
> -summary          dmesg_common test, at 1 log line: 16
> +summary          dmesg_common test, at 1 log line: 17
>   summary           "CRITICAL Kernel message: [ 0.408874] CPU1: Temperature above threshold, cpu clock throttled (total events = 1)"
> -summary          dmesg_common test, at 1 log line: 23
> +summary          dmesg_common test, at 1 log line: 24
>   summary           "CRITICAL Kernel message: [ 0.728985] Disabling IRQ #15"
> -summary          dmesg_common test, at 1 log line: 29
> +summary          dmesg_common test, at 1 log line: 30
>   summary           "CRITICAL Kernel message: [ 0.734767] Disabling IRQ #11"
> -summary          dmesg_common test, at 1 log line: 35
> +summary          dmesg_common test, at 1 log line: 36
>   summary           "CRITICAL Kernel message: [ 0.768555] CPU3: Temperature above threshold, cpu clock throttled (total events = 1)"
> -summary          dmesg_common test, at 1 log line: 42
> +summary          dmesg_common test, at 1 log line: 43
>   summary           "CRITICAL Kernel message: [ 1.128275] CPU5: Temperature above threshold, cpu clock throttled (total events = 1)"
> -summary          dmesg_common test, at 1 log line: 49
> +summary          dmesg_common test, at 1 log line: 50
>   summary           "CRITICAL Kernel message: [ 1.487778] CPU7: Temperature above threshold, cpu clock throttled (total events = 1)"
> -summary          dmesg_common test, at 1 log line: 56
> +summary          dmesg_common test, at 1 log line: 57
>   summary           "CRITICAL Kernel message: [ 2.131632] Disabling IRQ #16"
> -summary          dmesg_common test, at 1 log line: 62
> +summary          dmesg_common test, at 1 log line: 63
>   summary           "CRITICAL Kernel message: [ 3.220411] Disabling IRQ #18"
> -summary          dmesg_common test, at 1 log line: 68
> +summary          dmesg_common test, at 1 log line: 69
>   summary           "CRITICAL Kernel message: [ 10.027255] CPU0: Temperature above threshold, cpu clock throttled (total events = 1)"
> -summary          dmesg_common test, at 1 log line: 75
> +summary          dmesg_common test, at 1 log line: 76
>   summary           "CRITICAL Kernel message: [ 11.592319] CPU1: Temperature above threshold, cpu clock throttled (total events = 2)"
> -summary          dmesg_common test, at 1 log line: 82
> +summary          dmesg_common test, at 1 log line: 83
>   summary           "CRITICAL Kernel message: [ 17.353310] Disabling IRQ #10"
>   summary
>   summary         High failures: NONE

I fear these kind of line changes could make it a maintenance nightmare. 
  Perhaps we should look at adding some more intelligence into the 
checking script to grep out the "log line:" lines and just compare the 
remaining text, e.g. changing dmesg_common-0001/test-0002.sh to:

$FWTS -w 80 --klog=dmesg_common.txt dmesg_common - | grep summary| grep 
-v "log line:" | cut -c7-  > $TMPLOG

What do you think?

Colin
Keng-Yu Lin - Feb. 6, 2012, 9:56 a.m.
On Thu, Feb 2, 2012 at 6:51 PM, Colin Ian King <colin.king@canonical.com> wrote:
> On 02/02/12 08:48, Keng-Yu Lin wrote:
>>
>> Signed-off-by: Keng-Yu Lin<kengyu@canonical.com>
>> ---
>>  dmesg_common-0001/dmesg_common-0002.log |   22 +++++++++++-----------
>>  1 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/dmesg_common-0001/dmesg_common-0002.log
>> b/dmesg_common-0001/dmesg_common-0002.log
>> index b24dc41..0a501b3 100644
>> --- a/dmesg_common-0001/dmesg_common-0002.log
>> +++ b/dmesg_common-0001/dmesg_common-0002.log
>> @@ -6,27 +6,27 @@ summary         Test Failure Summary
>>  summary         ====================
>>  summary
>>  summary         Critical failures: 11
>> -summary          dmesg_common test, at 1 log line: 16
>> +summary          dmesg_common test, at 1 log line: 17
>>  summary           "CRITICAL Kernel message: [ 0.408874] CPU1: Temperature
>> above threshold, cpu clock throttled (total events = 1)"
>> -summary          dmesg_common test, at 1 log line: 23
>> +summary          dmesg_common test, at 1 log line: 24
>>  summary           "CRITICAL Kernel message: [ 0.728985] Disabling IRQ
>> #15"
>> -summary          dmesg_common test, at 1 log line: 29
>> +summary          dmesg_common test, at 1 log line: 30
>>  summary           "CRITICAL Kernel message: [ 0.734767] Disabling IRQ
>> #11"
>> -summary          dmesg_common test, at 1 log line: 35
>> +summary          dmesg_common test, at 1 log line: 36
>>  summary           "CRITICAL Kernel message: [ 0.768555] CPU3: Temperature
>> above threshold, cpu clock throttled (total events = 1)"
>> -summary          dmesg_common test, at 1 log line: 42
>> +summary          dmesg_common test, at 1 log line: 43
>>  summary           "CRITICAL Kernel message: [ 1.128275] CPU5: Temperature
>> above threshold, cpu clock throttled (total events = 1)"
>> -summary          dmesg_common test, at 1 log line: 49
>> +summary          dmesg_common test, at 1 log line: 50
>>  summary           "CRITICAL Kernel message: [ 1.487778] CPU7: Temperature
>> above threshold, cpu clock throttled (total events = 1)"
>> -summary          dmesg_common test, at 1 log line: 56
>> +summary          dmesg_common test, at 1 log line: 57
>>  summary           "CRITICAL Kernel message: [ 2.131632] Disabling IRQ
>> #16"
>> -summary          dmesg_common test, at 1 log line: 62
>> +summary          dmesg_common test, at 1 log line: 63
>>  summary           "CRITICAL Kernel message: [ 3.220411] Disabling IRQ
>> #18"
>> -summary          dmesg_common test, at 1 log line: 68
>> +summary          dmesg_common test, at 1 log line: 69
>>  summary           "CRITICAL Kernel message: [ 10.027255] CPU0:
>> Temperature above threshold, cpu clock throttled (total events = 1)"
>> -summary          dmesg_common test, at 1 log line: 75
>> +summary          dmesg_common test, at 1 log line: 76
>>  summary           "CRITICAL Kernel message: [ 11.592319] CPU1:
>> Temperature above threshold, cpu clock throttled (total events = 2)"
>> -summary          dmesg_common test, at 1 log line: 82
>> +summary          dmesg_common test, at 1 log line: 83
>>  summary           "CRITICAL Kernel message: [ 17.353310] Disabling IRQ
>> #10"
>>  summary
>>  summary         High failures: NONE
>
>
> I fear these kind of line changes could make it a maintenance nightmare.
>  Perhaps we should look at adding some more intelligence into the checking
> script to grep out the "log line:" lines and just compare the remaining
> text, e.g. changing dmesg_common-0001/test-0002.sh to:
>
> $FWTS -w 80 --klog=dmesg_common.txt dmesg_common - | grep summary| grep -v
> "log line:" | cut -c7-  > $TMPLOG
>
> What do you think?
>
> Colin
>
>
>
sounds doable. forming a patch.

Patch

diff --git a/dmesg_common-0001/dmesg_common-0002.log b/dmesg_common-0001/dmesg_common-0002.log
index b24dc41..0a501b3 100644
--- a/dmesg_common-0001/dmesg_common-0002.log
+++ b/dmesg_common-0001/dmesg_common-0002.log
@@ -6,27 +6,27 @@  summary         Test Failure Summary
 summary         ====================
 summary         
 summary         Critical failures: 11
-summary          dmesg_common test, at 1 log line: 16
+summary          dmesg_common test, at 1 log line: 17
 summary           "CRITICAL Kernel message: [ 0.408874] CPU1: Temperature above threshold, cpu clock throttled (total events = 1)"
-summary          dmesg_common test, at 1 log line: 23
+summary          dmesg_common test, at 1 log line: 24
 summary           "CRITICAL Kernel message: [ 0.728985] Disabling IRQ #15"
-summary          dmesg_common test, at 1 log line: 29
+summary          dmesg_common test, at 1 log line: 30
 summary           "CRITICAL Kernel message: [ 0.734767] Disabling IRQ #11"
-summary          dmesg_common test, at 1 log line: 35
+summary          dmesg_common test, at 1 log line: 36
 summary           "CRITICAL Kernel message: [ 0.768555] CPU3: Temperature above threshold, cpu clock throttled (total events = 1)"
-summary          dmesg_common test, at 1 log line: 42
+summary          dmesg_common test, at 1 log line: 43
 summary           "CRITICAL Kernel message: [ 1.128275] CPU5: Temperature above threshold, cpu clock throttled (total events = 1)"
-summary          dmesg_common test, at 1 log line: 49
+summary          dmesg_common test, at 1 log line: 50
 summary           "CRITICAL Kernel message: [ 1.487778] CPU7: Temperature above threshold, cpu clock throttled (total events = 1)"
-summary          dmesg_common test, at 1 log line: 56
+summary          dmesg_common test, at 1 log line: 57
 summary           "CRITICAL Kernel message: [ 2.131632] Disabling IRQ #16"
-summary          dmesg_common test, at 1 log line: 62
+summary          dmesg_common test, at 1 log line: 63
 summary           "CRITICAL Kernel message: [ 3.220411] Disabling IRQ #18"
-summary          dmesg_common test, at 1 log line: 68
+summary          dmesg_common test, at 1 log line: 69
 summary           "CRITICAL Kernel message: [ 10.027255] CPU0: Temperature above threshold, cpu clock throttled (total events = 1)"
-summary          dmesg_common test, at 1 log line: 75
+summary          dmesg_common test, at 1 log line: 76
 summary           "CRITICAL Kernel message: [ 11.592319] CPU1: Temperature above threshold, cpu clock throttled (total events = 2)"
-summary          dmesg_common test, at 1 log line: 82
+summary          dmesg_common test, at 1 log line: 83
 summary           "CRITICAL Kernel message: [ 17.353310] Disabling IRQ #10"
 summary         
 summary         High failures: NONE