Bug 134195 - [EFL] Remove WebKit1 related code from scripts
Summary: [EFL] Remove WebKit1 related code from scripts
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit EFL (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Michal Pakula vel Rutka
Depends on: 134245 134299 134391
Blocks: 134087
  Show dependency treegraph
Reported: 2014-06-23 08:44 PDT by Michal Pakula vel Rutka
Modified: 2014-06-27 08:01 PDT (History)
7 users (show)

See Also:

proposed patch (5.22 KB, patch)
2014-06-23 08:50 PDT, Michal Pakula vel Rutka
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michal Pakula vel Rutka 2014-06-23 08:44:36 PDT
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.
Comment 1 Michal Pakula vel Rutka 2014-06-23 08:50:39 PDT
Created attachment 233609 [details]
proposed patch
Comment 2 Csaba Osztrogonác 2014-06-23 09:24:06 PDT
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.
Comment 3 Laszlo Gombos 2014-06-24 15:31:34 PDT
Comment on attachment 233609 [details]
proposed patch


Seems combining the expectation files are already landed - http://trac.webkit.org/changeset/170354 .
Comment 4 WebKit Commit Bot 2014-06-25 05:25:45 PDT
Comment on attachment 233609 [details]
proposed patch

Clearing flags on attachment: 233609

Committed r170426: <http://trac.webkit.org/changeset/170426>
Comment 5 WebKit Commit Bot 2014-06-25 05:25:49 PDT
All reviewed patches have been landed.  Closing bug.
Comment 6 Laszlo Gombos 2014-06-25 07:18:38 PDT
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
  AssertionError: 'efl' is not None
Comment 7 Michal Pakula vel Rutka 2014-06-25 08:12:46 PDT
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.
Comment 8 Michal Pakula vel Rutka 2014-06-27 08:01:54 PDT
efl-wk2 baselines were removed in <http://trac.webkit.org/changeset/170527>