- Revision
- 170527
- Author
- [email protected]
- Date
- 2014-06-27 07:00:29 -0700 (Fri, 27 Jun 2014)
Log Message
[EFL] Remove efl-wk2 from baseline search path
https://bugs.webkit.org/show_bug.cgi?id=134391
Reviewed by Gyuyoung Kim.
As WebKit1 EFL is removed and platform/efl and platform/efl-wk2 baselines and test expectations files
are merged efl-wk2 search path should be removed.
* Scripts/webkitpy/port/base.py:
(Port.test_expectations_file_postion): Added method to determine port test expectations file position in expectations_dict.
* Scripts/webkitpy/port/efl.py:
(EflPort._search_paths): Changed baseline search paths from efl-wk2 -> wk2 -> efl -> generic is changed to: efl -> wk2 -> generic.
(EflPort.test_expectations_file_postion): Added method to determine EFL port specific test expectation file position.
* Scripts/webkitpy/port/port_testcase.py:
(PortTestCase.test_expectations_ordering): Changed constant value to one returned from test_expectations_file_postion().
* Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
(TestExpectationsTestCase.test_determine_port_from_expectations_path): Removed efl-wk2 test case.
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
(TestRebaselineTest.test_baseline_directory): Changed directory name in assertion from platform/efl-wk2 to platform/efl.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (170526 => 170527)
--- trunk/Tools/ChangeLog 2014-06-27 11:28:20 UTC (rev 170526)
+++ trunk/Tools/ChangeLog 2014-06-27 14:00:29 UTC (rev 170527)
@@ -1,3 +1,25 @@
+2014-06-27 Michał Pakuła vel Rutka <[email protected]>
+
+ [EFL] Remove efl-wk2 from baseline search path
+ https://bugs.webkit.org/show_bug.cgi?id=134391
+
+ Reviewed by Gyuyoung Kim.
+
+ As WebKit1 EFL is removed and platform/efl and platform/efl-wk2 baselines and test expectations files
+ are merged efl-wk2 search path should be removed.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.test_expectations_file_postion): Added method to determine port test expectations file position in expectations_dict.
+ * Scripts/webkitpy/port/efl.py:
+ (EflPort._search_paths): Changed baseline search paths from efl-wk2 -> wk2 -> efl -> generic is changed to: efl -> wk2 -> generic.
+ (EflPort.test_expectations_file_postion): Added method to determine EFL port specific test expectation file position.
+ * Scripts/webkitpy/port/port_testcase.py:
+ (PortTestCase.test_expectations_ordering): Changed constant value to one returned from test_expectations_file_postion().
+ * Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
+ (TestExpectationsTestCase.test_determine_port_from_expectations_path): Removed efl-wk2 test case.
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ (TestRebaselineTest.test_baseline_directory): Changed directory name in assertion from platform/efl-wk2 to platform/efl.
+
2014-06-26 Dan Bernstein <[email protected]>
prepare-ChangeLog outputs (NS_ENUM): entries for Cocoa enums
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (170526 => 170527)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2014-06-27 11:28:20 UTC (rev 170526)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2014-06-27 14:00:29 UTC (rev 170527)
@@ -1390,6 +1390,10 @@
def logging_patterns_to_strip(self):
return []
+ def test_expectations_file_position(self):
+ # By default baseline search path schema is i.e. port-wk2 -> wk2 -> port -> generic, so port expectations file is at second to last position.
+ return 1
+
class VirtualTestSuite(object):
def __init__(self, name, base, args, tests=None):
self.name = name
Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (170526 => 170527)
--- trunk/Tools/Scripts/webkitpy/port/efl.py 2014-06-27 11:28:20 UTC (rev 170526)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2014-06-27 14:00:29 UTC (rev 170527)
@@ -110,9 +110,8 @@
def _search_paths(self):
search_paths = []
- search_paths.append(self.port_name + '-wk2')
+ search_paths.append(self.port_name)
search_paths.append('wk2')
- search_paths.append(self.port_name)
return search_paths
def default_baseline_search_path(self):
@@ -145,3 +144,7 @@
def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
+
+ def test_expectations_file_position(self):
+ # EFL port baseline search path is efl -> wk2 -> generic (as efl-wk2 and efl baselines are merged), so port test expectations file is at third to last position.
+ return 2
Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (170526 => 170527)
--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2014-06-27 11:28:20 UTC (rev 170526)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2014-06-27 14:00:29 UTC (rev 170527)
@@ -418,7 +418,7 @@
port._filesystem.write_text_file(path, '')
ordered_dict = port.expectations_dict()
self.assertEqual(port.path_to_generic_test_expectations_file(), ordered_dict.keys()[0])
- self.assertEqual(port.path_to_test_expectations_file(), ordered_dict.keys()[1])
+ self.assertEqual(port.path_to_test_expectations_file(), ordered_dict.keys()[port.test_expectations_file_position()])
options = MockOptions(additional_expectations=['/tmp/foo', '/tmp/bar'])
port = self.make_port(options=options)
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py (170526 => 170527)
--- trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py 2014-06-27 11:28:20 UTC (rev 170526)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py 2014-06-27 14:00:29 UTC (rev 170527)
@@ -77,7 +77,6 @@
self._expect_port_for_expectations_path(None, '/mock-checkout/LayoutTests/platform/win/TestExpectations')
self._expect_port_for_expectations_path('win', 'LayoutTests/platform/win/TestExpectations')
self._expect_port_for_expectations_path('efl', 'LayoutTests/platform/efl/TestExpectations')
- self._expect_port_for_expectations_path('efl', 'LayoutTests/platform/efl-wk2/TestExpectations')
def assert_lines_lint(self, lines, should_pass, expected_output=None):
self._error_collector.reset_errors()
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (170526 => 170527)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-06-27 11:28:20 UTC (rev 170526)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-06-27 14:00:29 UTC (rev 170527)
@@ -93,7 +93,7 @@
self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
- self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl-wk2")
+ self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl")
def test_rebaseline_updates_expectations_file_noop(self):
self._zero_out_test_expectations()
