Bug 95370 – NRWT should look in mac-wk2 for a TestExpecations file

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Jessie Berlin]

I attempted to add a TestExpectations file for mac-wk2 today and NRWT wasn't picking it up when I ran the WK2 tests on Lion unless I passed it as the value for --additional-expectations.

[Dirk Pranke]

Created attachment 161352 [details]
Patch

[Jessie Berlin]

Comment on attachment 161352 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=161352&action=review

> Tools/Scripts/webkitpy/layout_tests/port/mac.py:279
> +            files.append(self._filesystem.join(self._webkit_baseline_path('mac-wk2'), 'TestExpectations'))

What about qt-wk2 gtk-wk2? Is there a way to make this generic for them and future wk2 ports?

[Dirk Pranke]

qt has their own logic which already handles this (the qt search path is more complicated).

we could add this for gtk, efl, etc. if they wanted it but right now they haven't indicated a need. chromium doesn't :).

I can push this up into apple.py if you want the same logic across apple mac and apple win, at least.

[Jessie Berlin]

(In reply to comment #3)
> qt has their own logic which already handles this (the qt search path is more complicated).
> 
> we could add this for gtk, efl, etc. if they wanted it but right now they haven't indicated a need. chromium doesn't :).
> 
> I can push this up into apple.py if you want the same logic across apple mac and apple win, at least.

Pushing it up into apple.py would be better, so that it just works when you get NRWT working on Windows :)

[Dirk Pranke]

Created attachment 161529 [details]
Patch

[Dirk Pranke]

Okay, added win-wk2 support as well.

Note that we will still only search in platform/mac and platform/mac-wk2 . Do you want to add support for platform/mac-$VERSION as well?

[Dirk Pranke]

Created attachment 161531 [details]
fix mac.py

[Dirk Pranke]

committed in http://trac.webkit.org/changeset/127174 .

(If you do want mac-$VERSION, let me know and I'll file a separate bug w/ a patch).

[Jessie Berlin]

(In reply to comment #6)
> Okay, added win-wk2 support as well.
> 
> Note that we will still only search in platform/mac and platform/mac-wk2 . Do you want to add support for platform/mac-$VERSION as well?

I am not sure what you mean by mac-$VERSION. For example, do you mean mac-lion-wk2? Or just mac-lion?

[Dirk Pranke]

(In reply to comment #9)
> (In reply to comment #6)
> > Okay, added win-wk2 support as well.
> > 
> > Note that we will still only search in platform/mac and platform/mac-wk2 . Do you want to add support for platform/mac-$VERSION as well?
> 
> I am not sure what you mean by mac-$VERSION. For example, do you mean mac-lion-wk2? Or just mac-lion?

just mac-lion.

[Jessie Berlin]

(In reply to comment #8)
> committed in http://trac.webkit.org/changeset/127174 .
> 
> (If you do want mac-$VERSION, let me know and I'll file a separate bug w/ a patch).

For those watching at home, this broke the layout tests because no TestExpectations file existed for mac-wk2. Dirk is fixing this by adding that file.