Changeset 148190 in webkit

Timestamp:

Apr 11, 2013 3:00:33 AM (11 years ago)

Author:

rniwa@webkit.org

Message:

Remove code for Chromium from wkbuild.py
​https://bugs.webkit.org/show_bug.cgi?id=114423

Reviewed by Benjamin Poulain.

• BuildSlaveSupport/build.webkit.org-config/wkbuild.py:

(_should_file_trigger_build):

• BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:

(ShouldBuildTest):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/wkbuild.py (modified) (3 diffs)
• BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py

@@ -56 +56 @@
 
         # Directories that should trigger builds on only some bots.
-        ("Source/WebCore/image-decoders", ["chromium"]),
         ("LayoutTests/platform/mac", ["mac", "win"]),
         ("cairo", ["gtk", "wincairo"]),
-        ("cf", ["chromium-mac", "mac", "qt", "win"]),
-        ("chromium", ["chromium"]),
-        ("cocoa", ["chromium-mac", "mac"]),
+        ("cf", ["mac", "qt", "win"]),
+        ("cocoa", ["mac"]),
         ("curl", ["gtk", "wincairo"]),
         ("gobject", ["gtk"]),
-        ("gpu", ["chromium", "mac"]),
+        ("gpu", ["mac"]),
         ("gstreamer", ["gtk"]),
         ("gtk", ["gtk"]),
-        ("mac", ["chromium-mac", "mac"]),
+        ("mac", ["mac"]),
         ("mac-leopard", ["mac-leopard"]),
         ("mac-lion", ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
@@ -74 +72 @@
         ("objc", ["mac"]),
         ("qt", ["qt"]),
-        ("skia", ["chromium"]),
         ("soup", ["gtk"]),
-        ("v8", ["chromium"]),
-        ("win", ["chromium-win", "win"]),
+        ("win", ["win"]),
     ]
     patterns = [
@@ -93 +89 @@
         # Patterns that should trigger builds on only some bots.
         (r"(?:^|/)GNUmakefile\.am$", ["gtk"]),
-        (r"/\w+Chromium\w*\.(?:cpp|h|mm)$", ["chromium"]),
         (r"Mac\.(?:cpp|h|mm)$", ["mac"]),
         (r"\.(?:vcproj|vsprops|sln|vcxproj|props|filters)$", ["win"]),
         (r"\.exp(?:\.in)?$", ["mac"]),
-        (r"\.gypi?", ["chromium"]),
         (r"\.order$", ["mac"]),
         (r"\.pr[io]$", ["qt"]),

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py

@@ -21 +21 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import unittest2 as unittest
-
+import unittest
 import wkbuild
 
@@ -37 +36 @@
         (["LayoutTests/foo"], ["*"]),
         (["LayoutTests/canvas/philip/tests/size.attributes.parse.exp-expected.txt", "LayoutTests/canvas/philip/tests/size.attributes.parse.exp.html"], ["*"]),
-        (["LayoutTests/platform/chromium-linux/foo"], ["chromium-linux"]),
-        (["LayoutTests/platform/chromium-win/fast/compact/001-expected.txt"], ["chromium-win"]),
         (["LayoutTests/platform/mac-leopard/foo"], ["mac-leopard"]),
         (["LayoutTests/platform/mac-lion/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
@@ -48 +45 @@
         (["LayoutTests/platform/win/foo"], ["win"]),
         (["Source/WebCore.exp.in", "Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
-        (["Source/WebCore/mac/foo"], ["chromium-mac", "mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
-        (["Source/WebCore/win/foo"], ["chromium-win", "win"]),
+        (["Source/WebCore/mac/foo"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
+        (["Source/WebCore/win/foo"], ["win"]),
         (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
         (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
-        (["Source/WebCore/rendering/RenderThemeChromiumDefault.h"], ["chromium-linux"]),
         (["Source/WebCore/rendering/RenderThemeWinCE.h"], []),
         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),

trunk/Tools/ChangeLog

@@ +1 @@
+2013-04-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Remove code for Chromium from wkbuild.py
+        https://bugs.webkit.org/show_bug.cgi?id=114423
+
+        Reviewed by Benjamin Poulain.
+
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+        (_should_file_trigger_build):
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+        (ShouldBuildTest):
+
 2013-04-11  Philippe Normand  <pnormand@igalia.com>