841786 - Fix TBPL bug suggestion for bug 840165 (Shutdown hang on Windows with topframe in summary)

Status: VERIFIED FIXED

(Tree Management Graveyard :: TBPL, defect)

Description

[Ed Morley [:emorley]]

At the moment TBPL is unable to star bug 840165, even with the "use the top crash frame" fallback.

The extra adding I added in bug 793159 allowed me to work out what was going on - we just never match using:
https://hg.mozilla.org/webtools/tbpl/file/389170d95421/php/inc/AnnotatedSummaryGenerator.php#l100
{
   100     if (empty($bugs) && preg_match('/application crashed \[@ (.+)\]$/', $line, $matches))
}

The reason being that on Windows, $line ends with "\r" from the \r\n, which GzipUtils::getLines hasn't stripped out:
https://hg.mozilla.org/webtools/tbpl/file/389170d95421/php/inc/GzipUtils.php#l73
{
    72     // we want to have lines that are terminated by \n.
    73     $lines = preg_split("/([^\n]*\n)/", $content, -1,
    74       PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
    75     return $lines;
}

I have no idea why we choose to keep the line endings in the array of lines; and a play about with the regexp above was breaking more things than it fixed - so the easiest solution for now looks to just be to trim($line) in AnnotatedSummaryGenerator.php and call it a day.

Comment 1

[Ed Morley [:emorley]]

Attachment: Patch v1

Comment 2

[Ed Morley [:emorley]]

(In reply to Ed Morley [:edmorley UTC+0] from comment #0)
> The extra adding I added in bug 793159

err 'logging'.

And just to clarify, we were trying to match against:
  application crashed \[@ (.+)\]$
...when the string on Windows was actually:
  application crashed \[@ (.+)\]\r$

Comment 3

[Ed Morley [:emorley]]

Landed then backed out for breaking multiple line annotated summaries. Have a new version locally, will test first.

Comment 4

[Ed Morley [:emorley]]

Attachment: Patch v2

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 717218 [details] [diff] [review]
Patch v2

Makes sense.

Comment 6

[Ed Morley [:emorley]]

https://hg.mozilla.org/webtools/tbpl/rev/a1dbe3302f33

Comment 7

[Ed Morley [:emorley]]

In production :-)

Comment 8

[Ed Morley [:emorley]]

:-D