Changeset 128117 in webkit

Timestamp:

Sep 10, 2012 3:22:01 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

TestExpectationsChecker._determine_port_from_expectations_path() does not support cascaded TestExpectations
​https://bugs.webkit.org/show_bug.cgi?id=96205

Patch by Christophe Dumez <Christophe Dumez> on 2012-09-10
Reviewed by Tony Chang.

_determine_port_from_expectations_path() was calling port.path_to_test_expectations_file()
internally, which means that it would support only 1 TestExpectations file per port. This
is an issue for ports such as EFL that support cascased TestExpectations (efl-wk2 -> efl
and efl-wk1 -> efl).

This patch makes _determine_port_from_expectations_path() call port.expectations_files()
instead so that all the ports TestExpectations are recognized. The ports are also
constructed twice, with "webkit_test_runner" option set to True and False so that we
retrieve the TestExpectations paths for both WebKit1 and WebKit2.

• Scripts/webkitpy/style/checkers/test_expectations.py:

(TestExpectationsChecker._determine_port_from_expectations_path):

• Scripts/webkitpy/style/checkers/test_expectations_unittest.py: Add corresponding unit test.

(TestExpectationsTestCase.test_determine_port_from_expectations_path):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/test_expectations.py (modified) (1 diff)
• Scripts/webkitpy/style/checkers/test_expectations_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
+
+        TestExpectationsChecker._determine_port_from_expectations_path() does not support cascaded TestExpectations
+        https://bugs.webkit.org/show_bug.cgi?id=96205
+
+        Reviewed by Tony Chang.
+
+        _determine_port_from_expectations_path() was calling port.path_to_test_expectations_file()
+        internally, which means that it would support only 1 TestExpectations file per port. This
+        is an issue for ports such as EFL that support cascased TestExpectations (efl-wk2 -> efl
+        and efl-wk1 -> efl).
+
+        This patch makes _determine_port_from_expectations_path() call port.expectations_files()
+        instead so that all the ports TestExpectations are recognized. The ports are also
+        constructed twice, with "webkit_test_runner" option set to True and False so that we
+        retrieve the TestExpectations paths for both WebKit1 and WebKit2.
+
+        * Scripts/webkitpy/style/checkers/test_expectations.py:
+        (TestExpectationsChecker._determine_port_from_expectations_path):
+        * Scripts/webkitpy/style/checkers/test_expectations_unittest.py: Add corresponding unit test.
+        (TestExpectationsTestCase.test_determine_port_from_expectations_path):
+
 2012-09-10  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py

@@ -50 +50 @@
     def _determine_port_from_expectations_path(self, host, expectations_path):
         # Pass a configuration to avoid calling default_configuration() when initializing the port (takes 0.5 seconds on a Mac Pro!).
-        options = optparse.Values({'configuration': 'Release'})
+        options_wk1 = optparse.Values({'configuration': 'Release', 'webkit_test_runner': False})
+        options_wk2 = optparse.Values({'configuration': 'Release', 'webkit_test_runner': True})
         for port_name in host.port_factory.all_port_names():
-            port = host.port_factory.get(port_name, options=options)
-            if port.path_to_test_expectations_file().replace(port.path_from_webkit_base() + host.filesystem.sep, '') == expectations_path:
-                return port
+            ports = [host.port_factory.get(port_name, options=options_wk1), host.port_factory.get(port_name, options=options_wk2)]
+            for port in ports:
+                for test_expectation_file in port.expectations_files():
+                    if test_expectation_file.replace(port.path_from_webkit_base() + host.filesystem.sep, '') == expectations_path:
+                        return port
         return None
 

trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py

@@ -80 +80 @@
         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-wk1/TestExpectations')
+        self._expect_port_for_expectations_path('efl', 'LayoutTests/platform/efl-wk2/TestExpectations')
 
     def assert_lines_lint(self, lines, should_pass, expected_output=None):