Bug 95353 – '\r's in test expectations files confused chromium-android layout test driver

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Xianzhu Wang]

The following layout tests will output '\r's in the test results, which confuses chromium-android layout test driver because the new lines will be formalized when reading through 'adb shell':

fast/dom/Window/window-property-clearing.html
LayoutTests/fast/dom/simultaneouslyRegsiteredTimerFireOrder.html

[Xianzhu Wang]

Created attachment 161249 [details]
Patch

[Xianzhu Wang]

Seems that this kind of patch can't be applied in normal way.

I can also leave the expectation files unchanged, because at least on chromium-linux and chromium-android the line separators are ignored when comparing actual results to expectations, but I don't know how other platforms deal with line separators.

[Adam Barth]

We can also land it manually.

[Adam Barth]

Let me know what you prefer.

[Xianzhu Wang]

(In reply to comment #4)
> Let me know what you prefer.

I'd like to try CQ first. If it can't make it, I'll land it manually.

[Adam Barth]

Comment on attachment 161249 [details]
Patch

I doubt the cq will do any better than the style bot.

[Xianzhu Wang]

(In reply to comment #6)
> (From update of attachment 161249 [details])
> I doubt the cq will do any better than the style bot.

Agreed. As just found an unexpected change in the uploaded patch, I'll fix that try to submit it manually. Will be careful not to make the mistake as before :)

[Xianzhu Wang]

Created attachment 161260 [details]
=Fixed an unexpected change. Will land manually

[Xianzhu Wang]

Committed r127012: <http://trac.webkit.org/changeset/127012>