[zorg] r173940 - Fix for lines of the type: \* TEST '.' FAILED \*

[David Blaikie]

On Wed, Jan 30, 2013 at 7:43 AM, David Dean <david_dean at apple.com> wrote:
> Author: ddean
> Date: Wed Jan 30 09:43:31 2013
> New Revision: 173940
>
> URL: http://llvm.org/viewvc/llvm-project?rev=173940&view=rev
> Log:
> Fix for lines of the type: \* TEST '.' FAILED \*
>
> Modified:
>     zorg/trunk/zorg/buildbot/commands/LitTestCommand.py
>
> Modified: zorg/trunk/zorg/buildbot/commands/LitTestCommand.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/LitTestCommand.py?rev=173940&r1=173939&r2=173940&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/commands/LitTestCommand.py (original)
> +++ zorg/trunk/zorg/buildbot/commands/LitTestCommand.py Wed Jan 30 09:43:31 2013
> @@ -33,7 +33,7 @@ class LitLogObserver(LogLineObserver):
>      # Check for test failure logs.
>      m = self.kTestFailureLogStartRE.match(line)
>      if m and self.inFailure:
> -      if m.group(0) == self.inFailure[0]:
> +      if self.inFailure[0] in m.group(0):

Does this actually work? I would assume it would fail to match the
kTestFailureLogStartRE pattern:

re.compile(r"""\*{4,80} TEST '(.*)' .*""")

The right fix is probably to leave the comparison the way it was &
change the pattern to accept an optional result:

re.compile(r"""\*{4,80} TEST '(.*)'( \w*)? .*""")

or something like that?

- David

>            self.inFailure[1].append(line)
>            self.inFailureContext = True
>            return
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits