Changeset 150850 in webkit

Timestamp:

May 28, 2013 3:59:03 PM (11 years ago)

Author:

Brent Fulgham

Message:

[Windows] NRWT reports failure for 'mac' test cases.
​https://bugs.webkit.org/show_bug.cgi?id=116698

Reviewed by Ryosuke Niwa.

The Windows port falls back to the Mac port for many test results,
and so adds the mac and mac-wk2 to its set of fallbacks.
Unfortunately, NRWT thinks that this means that tests in these
folders should be executed, resulting in many failures on
Windows.

This change overloads the '_tests_for_other_platforms' method
to return a subset of the result fallback list so that we do
not attempt to execute Mac tests on Windows.

• Scripts/webkitpy/port/base.py:

(Port.test_search_path): Added. Defaults to just calling the
baseline_search_path method, which is how most ports behave.
(Port._test_for_other_platforms): Modified to call the new
test_search_path method.

• Scripts/webkitpy/port/win.py:

(WinPort.test_search_path): Added custom overload. Strips
out mac-specific test paths.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (2 diffs)
• Scripts/webkitpy/port/win.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-28  Brent Fulgham  <bfulgham@apple.com>
+
+        [Windows] NRWT reports failure for 'mac' test cases.
+        https://bugs.webkit.org/show_bug.cgi?id=116698
+
+        Reviewed by Ryosuke Niwa.
+
+        The Windows port falls back to the Mac port for many test results,
+        and so adds the mac and mac-wk2 to its set of fallbacks.
+        Unfortunately, NRWT thinks that this means that tests in these
+        folders should be executed, resulting in many failures on
+        Windows.
+
+        This change overloads the '_tests_for_other_platforms' method
+        to return a subset of the result fallback list so that we do
+        not attempt to execute Mac tests on Windows.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.test_search_path): Added. Defaults to just calling the
+        baseline_search_path method, which is how most ports behave.
+        (Port._test_for_other_platforms): Modified to call the new
+        test_search_path method.
+
+        * Scripts/webkitpy/port/win.py:
+        (WinPort.test_search_path): Added custom overload. Strips
+        out mac-specific test paths.
+
 2013-05-28  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -1456 +1456 @@
         return []
 
+    def test_search_path(self):
+        return self.baseline_search_path()
+
     def _tests_for_other_platforms(self):
         # By default we will skip any directory under LayoutTests/platform
@@ -1464 +1467 @@
         dirs_to_skip = []
         for entry in entries:
-            if self._filesystem.isdir(entry) and entry not in self.baseline_search_path():
+            if self._filesystem.isdir(entry) and entry not in self.test_search_path():
                 basename = self._filesystem.basename(entry)
                 dirs_to_skip.append('platform/%s' % basename)

trunk/Tools/Scripts/webkitpy/port/win.py

@@ -119 +119 @@
     def _driver_tempdir_for_environment(self):
         return cygpath(self._driver_tempdir())
+
+    def test_search_path(self):
+        test_fallback_names = [path for path in self.baseline_search_path() if not path.startswith(self._webkit_baseline_path('mac'))]
+        return map(self._webkit_baseline_path, test_fallback_names)