| Summary: | [EFL] Remove WebKit1 related code from scripts | ||||||
|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Michal Pakula vel Rutka <mpakulavelrutka> | ||||
| Component: | WebKit EFL | Assignee: | Michal Pakula vel Rutka <mpakulavelrutka> | ||||
| Status: | RESOLVED FIXED | ||||||
| Severity: | Normal | CC: | commit-queue, dbates, glenn, laszlo.gombos, lucas.de.marchi, ossy, rniwa | ||||
| Priority: | P2 | ||||||
| Version: | 528+ (Nightly build) | ||||||
| Hardware: | Unspecified | ||||||
| OS: | Unspecified | ||||||
| Bug Depends on: | 134245, 134299, 134391 | ||||||
| Bug Blocks: | 134087 | ||||||
| Attachments: |
|
||||||
|
Description
Michal Pakula vel Rutka
2014-06-23 08:44:36 PDT
Created attachment 233609 [details]
proposed patch
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 on attachment 233609 [details] proposed patch lgtm. Seems combining the expectation files are already landed - http://trac.webkit.org/changeset/170354 . Comment on attachment 233609 [details] proposed patch Clearing flags on attachment: 233609 Committed r170426: <http://trac.webkit.org/changeset/170426> All reviewed patches have been landed. Closing bug. 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
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. efl-wk2 baselines were removed in <http://trac.webkit.org/changeset/170527> |