Changeset 56287 in webkit

Timestamp:

Mar 19, 2010 5:41:19 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

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

Reviewed by Dimitri Glazkov.

Disable the downstream override expectations temporarily to allow
us to test that we've upstreamed everything correctly. Also, stop
looking at the downstream baselines at all (now you will only be
able to update baselines upstream). In theory this should work, but
if we need to we can always add the downstream dirs back in.

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

• Scripts/webkitpy/layout_tests/port/chromium.py:
• 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) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium.py (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-19  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Disable the downstream override expectations temporarily to allow
+        us to test that we've upstreamed everything correctly. Also, stop
+        looking at the downstream baselines at all (now you will only be
+        able to update baselines upstream). In theory this should work, but
+        if we need to we can always add the downstream dirs back in.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36396
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * 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-19  Dirk Pranke  <dpranke@chromium.org>
 
@@ -12 +29 @@
         Reviewed by Dimitri Glazkov.
 
+>>>>>>> .r56286
         Flip the Chromium ports to look first for the test expectations
         in LayoutTests/platform/chromium and only afterwards look in the

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

@@ -167 +167 @@
 
     def test_expectations_overrides(self):
-        overrides_file = self.path_from_chromium_base('webkit', 'tools',
-            'layout_tests', 'test_expectations.txt')
-        if os.path.exists(overrides_file):
-            return file(overrides_file, "r").read()
-        else:
-            return None
+        # FIXME: uncomment this when we're convinced the upstream code
+        # is working.
+        #overrides_file = self.path_from_chromium_base('webkit', 'tools',
+        #    'layout_tests', 'test_expectations.txt')
+        #if os.path.exists(overrides_file):
+        #    return file(overrides_file, "r").read()
+        #else:
+        #    return None
+        return None
 
     def test_platform_names(self):

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

@@ -52 +52 @@
 
     def baseline_search_path(self):
-        # 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'),
+        return [self._webkit_baseline_path('chromium-linux'),
                 self._webkit_baseline_path('chromium-win'),
                 self._webkit_baseline_path('chromium'),

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

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

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('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'))