Changeset 56199 in webkit

Timestamp:

Mar 18, 2010 3:45:20 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-03-18 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Dimitri Glazkov.

Add upstream LayoutTests/platform/chromium* directories to the
baseline search path for new-run-webkit-tests in preparation for
upstreaming all of the Chromium baselines. Note that this does
not actually create the directories themselves, but that's okay.

​https://bugs.webkit.org/show_bug.cgi?id=36324

• Scripts/webkitpy/layout_tests/port/chromium_linux.py:
• Scripts/webkitpy/layout_tests/port/chromium_mac.py:
• Scripts/webkitpy/layout_tests/port/chromium_win.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_linux.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_mac.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_win.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-18  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Add upstream LayoutTests/platform/chromium* directories to the
+        baseline search path for new-run-webkit-tests in preparation for
+        upstreaming all of the Chromium baselines. Note that this does
+        not actually create the directories themselves, but that's okay.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36324
+
+        * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+
 2010-03-18  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py

@@ -52 +52 @@
 
     def baseline_search_path(self):
-        return [self.baseline_path(),
+        # FIXME: remove the downstream paths once we've migrated the
+        # baselines.
+        return [self._chromium_baseline_path('chromium-linux'),
                 self._chromium_baseline_path('chromium-win'),
+                self._webkit_baseline_path('chromium-linux'),
+                self._webkit_baseline_path('chromium-win'),
+                self._webkit_baseline_path('chromium'),
                 self._webkit_baseline_path('win'),
                 self._webkit_baseline_path('mac')]

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py

@@ -52 +52 @@
 
     def baseline_search_path(self):
-        return [self.baseline_path(),
+        # FIXME: remove the downstream paths once we've migrated the
+        # baselines.
+        return [self._chromium_baseline_path('chromium-mac'),
+                self._webkit_baseline_path('chromium-mac'),
+                self._webkit_baseline_path('chromium'),
                 self._webkit_baseline_path('mac' + self.version()),
                 self._webkit_baseline_path('mac')]

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py

@@ -53 +53 @@
 
     def baseline_search_path(self):
+        # FIXME: remove the downstream paths once we've migrated the
+        # baselines.
         dirs = []
         if self._name == 'chromium-win-xp':
-            dirs.append(self._chromium_baseline_path(self._name))
+            dirs.append(self._chromium_baseline_path('chromium-win-xp'))
         if self._name in ('chromium-win-xp', 'chromium-win-vista'):
             dirs.append(self._chromium_baseline_path('chromium-win-vista'))
         dirs.append(self._chromium_baseline_path('chromium-win'))
+        if self._name == 'chromium-win-xp':
+            dirs.append(self._webkit_baseline_path('chromium-win-xp'))
+        if self._name in ('chromium-win-xp', 'chromium-win-vista'):
+            dirs.append(self._webkit_baseline_path('chromium-win-vista'))
+        dirs.append(self._webkit_baseline_path('chromium-win'))
+        dirs.append(self._webkit_baseline_path('chromium'))
         dirs.append(self._webkit_baseline_path('win'))
         dirs.append(self._webkit_baseline_path('mac'))