Changeset 183641 in webkit

Timestamp:

Apr 30, 2015 1:01:18 PM (9 years ago)

Author:

ap@apple.com

Message:

r183355 didn't trigger Mac tests
​https://bugs.webkit.org/show_bug.cgi?id=144464

Reviewed by Simon Fraser.

Update badly neglected filters and unit tests.

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

(_should_file_trigger_build):

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

(ShouldBuildTest):
(ShouldBuildTest.test_should_build):

Location:

trunk/Tools

Files:

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

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

@@ -48 +48 @@
         ("Websites", []),
         ("efl", []),
-        ("iphone", []),
+        ("ios", []),
         ("opengl", []),
         ("opentype", []),
@@ -55 +55 @@
 
         # Directories that should trigger builds on only some bots.
+        ("LayoutTests/platform/mac-mavericks", ["mac-mavericks"]),
+        ("LayoutTests/platform/mac-yosemite", ["mac-mavericks", "mac-yosemite"]),
+        ("LayoutTests/platform/mac-wk2", ["mac-mavericks", "mac-yosemite"]),
+        ("LayoutTests/platform/mac-wk1", ["mac-mavericks", "mac-yosemite"]),
         ("LayoutTests/platform/mac", ["mac", "win"]),
+        ("LayoutTests/platform/wk2", ["mac"]),
         ("cairo", ["gtk", "wincairo"]),
-        ("cf", ["mac", "qt", "win"]),
+        ("cf", ["mac", "win"]),
         ("cocoa", ["mac"]),
         ("curl", ["gtk", "wincairo"]),
         ("gobject", ["gtk"]),
-        ("gpu", ["mac"]),
         ("gstreamer", ["gtk"]),
         ("gtk", ["gtk"]),
         ("mac", ["mac"]),
-        ("mac-leopard", ["mac-leopard"]),
-        ("mac-lion", ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
-        ("mac-mountainlion", ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard", "win"]),
-        ("mac-snowleopard", ["mac-leopard", "mac-snowleopard"]),
-        ("mac-wk2", ["mac-lion", "mac-snowleopard", "mac-mavericks", "mac-mountainlion", "win"]),
         ("objc", ["mac"]),
-        ("qt", ["qt"]),
         ("soup", ["gtk"]),
         ("win", ["win"]),
@@ -92 +90 @@
         (r"\.exp(?:\.in)?$", ["mac"]),
         (r"\.order$", ["mac"]),
-        (r"\.pr[io]$", ["qt"]),
         (r"\.(?:vcproj|vcxproj)/", ["win"]),
         (r"\.xcconfig$", ["mac"]),

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

@@ -28 +28 @@
     _should_build_tests = [
         (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit2/ChangeLog-2011-02-11"], []),
-        (["GNUmakefile.am", "Source/WebCore/GNUmakefile.am"], ["gtk"]),
         (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
         (["Websites/bugs.webkit.org/foo"], []),
-        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
+        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-mavericks", "mac-yosemite"]),
         (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
         (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
         (["LayoutTests/foo"], ["*"]),
         (["LayoutTests/canvas/philip/tests/size.attributes.parse.exp-expected.txt", "LayoutTests/canvas/philip/tests/size.attributes.parse.exp.html"], ["*"]),
-        (["LayoutTests/platform/mac-leopard/foo"], ["mac-leopard"]),
-        (["LayoutTests/platform/mac-lion/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
-        (["LayoutTests/platform/mac-snowleopard/foo"], ["mac-leopard", "mac-snowleopard"]),
-        (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-lion",  "mac-mountainlion", "mac-snowleopard", "win"]),
-        (["LayoutTests/platform/mac/foo"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard", "win"]),
+        (["LayoutTests/platform/mac-mavericks/foo"], ["mac-mavericks"]),
+        (["LayoutTests/platform/mac-yosemite/foo"], ["mac-mavericks", "mac-yosemite"]),
+        (["LayoutTests/platform/wk2/Skipped"], ["mac-mavericks", "mac-yosemite"]),
+        (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-mavericks", "mac-yosemite"]),
+        (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-mavericks", "mac-yosemite"]),
+        (["LayoutTests/platform/mac/foo"], ["mac-mavericks", "mac-yosemite", "win"]),
+        (["LayoutTests/platform/mac-wk2/platform/mac/editing/spelling/autocorrection-contraction-expected.txt"], ["mac-mavericks", "mac-yosemite"]),
         (["LayoutTests/platform/win-xp/foo"], ["win"]),
-        (["LayoutTests/platform/win-wk2/foo"], ["win"]),
+        (["LayoutTests/platform/win-wk1/foo"], ["win"]),
         (["LayoutTests/platform/win/foo"], ["win"]),
-        (["Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
-        (["Source/WebCore/mac/foo"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
+        (["Source/WebKit/mac/WebKit.mac.exp"], ["mac-mavericks", "mac-yosemite"]),
+        (["Source/WebCore/mac/foo"], ["mac-mavericks", "mac-yosemite"]),
         (["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/accessibility/ios/AXObjectCacheIOS.mm"], []),
+        (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-mavericks", "mac-yosemite"]),
         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
     ]
@@ -57 +58 @@
             # FIXME: We should test more platforms here once
             # wkbuild._should_file_trigger_build is implemented for them.
-            for platform in ["mac-leopard", "mac-lion",  "mac-mavericks", "mac-mountainlion", "mac-snowleopard", "win"]:
+            for platform in ["mac-mavericks", "mac-yosemite", "win"]:
                 should_build = platform in platforms or "*" in platforms
                 self.assertEqual(wkbuild.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))

trunk/Tools/ChangeLog

@@ +1 @@
+2015-04-30  Alexey Proskuryakov  <ap@apple.com>
+
+        r183355 didn't trigger Mac tests
+        https://bugs.webkit.org/show_bug.cgi?id=144464
+
+        Reviewed by Simon Fraser.
+
+        Update badly neglected filters and unit tests.
+
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+        (_should_file_trigger_build):
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+        (ShouldBuildTest):
+        (ShouldBuildTest.test_should_build):
+
 2015-04-30  Xabier Rodriguez Calvar  <calvaris@igalia.com>