Bug 134195 – [EFL] Remove WebKit1 related code from scripts

• Component: WebKit EFL
• Status: RESOLVED FIXED

[Michal Pakula vel Rutka]

After removing WebKit1 from EFL port still there is some code related to DumpRenderTree, EWebLauncher. Also running layout tests requires adding -2/--webkit-test-runner switch.

[Michal Pakula vel Rutka]

Created attachment 233609 [details]
proposed patch

[Csaba Osztrogonác]

Comment on attachment 233609 [details]
proposed patch

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

> Tools/Scripts/webkitpy/port/efl.py:113
> -        if self.get_option('webkit_test_runner'):
> -            search_paths.append(self.port_name + '-wk2')
> -            search_paths.append('wk2')
> -        else:
> -            search_paths.append(self.port_name + '-wk1')
> +        search_paths.append('wk2')

Before doing it, efl-wk2/TestExpectations should be merged to efl/TestExpectations.

[Laszlo Gombos]

Comment on attachment 233609 [details]
proposed patch

lgtm. 

Seems combining the expectation files are already landed - http://trac.webkit.org/changeset/170354 .

[WebKit Commit Bot]

Comment on attachment 233609 [details]
proposed patch

Clearing flags on attachment: 233609

Committed r170426: <http://trac.webkit.org/changeset/170426>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Laszlo Gombos]

Michal, it seems this change impacting some python test. Can you please check and and try to fix it !

[1203/1421] webkitpy.style.checkers.test_expectations_unittest.TestExpectationsTestCase.test_determine_port_from_expectations_path failed:
  Traceback (most recent call last):
    File "/Volumes/Data/slave/mavericks-debug-tests-wk1/build/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py", line 80, in test_determine_port_from_expectations_path
      self._expect_port_for_expectations_path('efl', 'LayoutTests/platform/efl-wk2/TestExpectations')
    File "/Volumes/Data/slave/mavericks-debug-tests-wk1/build/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py", line 73, in _expect_port_for_expectations_path
      self.assertIsNone(expected_port_implementation)
  AssertionError: 'efl' is not None

[Michal Pakula vel Rutka]

Regression was fixed by re-adding efl-wk2 to search paths <https://trac.webkit.org/changeset/170427>, still we have to remove this unnecessary path again without breaking tests.

[Michal Pakula vel Rutka]

efl-wk2 baselines were removed in <http://trac.webkit.org/changeset/170527>