<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190371] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190371">190371</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-30 16:03:28 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add iOS criterion for triggering a build
https://bugs.webkit.org/show_bug.cgi?id=149679
Rubber-stamped by Alexey Proskuryakov.
First pass at defining criterion for triggering an iOS build.
* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
(_should_file_trigger_build):
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
(ShouldBuildTest):
(ShouldBuildTest.test_should_build):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuildpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuild_unittestpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuildpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py (190370 => 190371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2015-09-30 22:28:08 UTC (rev 190370)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2015-09-30 23:03:28 UTC (rev 190371)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> # and start using it for their bots. Someone familiar with each platform
</span><span class="cx"> # will have to figure out what the right set of directories/patterns is for
</span><span class="cx"> # that platform.
</span><del>- assert(target_platform in ("mac-mavericks", "mac-yosemite", "mac-elcapitan", "win"))
</del><ins>+ assert(target_platform in ("mac-mavericks", "mac-yosemite", "mac-elcapitan", "win", "ios-9", "ios-simulator-9"))
</ins><span class="cx">
</span><span class="cx"> directories = [
</span><span class="cx"> # Directories that shouldn't trigger builds on any bots.
</span><span class="lines">@@ -47,29 +47,32 @@
</span><span class="cx"> ("Tools/BuildSlaveSupport/build.webkit.org-config/public_html", []),
</span><span class="cx"> ("Websites", []),
</span><span class="cx"> ("efl", []),
</span><del>- ("ios", []),
</del><span class="cx"> ("opengl", []),
</span><span class="cx"> ("opentype", []),
</span><span class="cx"> ("openvg", []),
</span><span class="cx"> ("wx", []),
</span><span class="cx">
</span><span class="cx"> # Directories that should trigger builds on only some bots.
</span><ins>+ ("LayoutTests/platform/ios-simulator", ["ios"]),
+ ("LayoutTests/platform/ios-simulator-wk1", ["ios"]),
+ ("LayoutTests/platform/ios-simulator-wk2", ["ios"]),
</ins><span class="cx"> ("LayoutTests/platform/mac-mavericks", ["mac-mavericks"]),
</span><span class="cx"> ("LayoutTests/platform/mac-yosemite", ["mac-mavericks", "mac-yosemite"]),
</span><span class="cx"> ("LayoutTests/platform/mac-elcapitan", ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><span class="cx"> ("LayoutTests/platform/mac-wk2", ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><span class="cx"> ("LayoutTests/platform/mac-wk1", ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><span class="cx"> ("LayoutTests/platform/mac", ["mac", "win"]),
</span><del>- ("LayoutTests/platform/wk2", ["mac"]),
</del><ins>+ ("LayoutTests/platform/wk2", ["mac", "ios"]),
</ins><span class="cx"> ("cairo", ["gtk", "wincairo"]),
</span><del>- ("cf", ["mac", "win"]),
- ("cocoa", ["mac"]),
</del><ins>+ ("cf", ["mac", "win", "ios"]),
+ ("cocoa", ["mac", "ios"]),
</ins><span class="cx"> ("curl", ["gtk", "wincairo"]),
</span><span class="cx"> ("gobject", ["gtk"]),
</span><span class="cx"> ("gstreamer", ["gtk"]),
</span><span class="cx"> ("gtk", ["gtk"]),
</span><ins>+ ("ios", ["ios"]),
</ins><span class="cx"> ("mac", ["mac"]),
</span><del>- ("objc", ["mac"]),
</del><ins>+ ("objc", ["mac", "ios"]),
</ins><span class="cx"> ("soup", ["gtk"]),
</span><span class="cx"> ("win", ["win"]),
</span><span class="cx"> ]
</span><span class="lines">@@ -87,12 +90,13 @@
</span><span class="cx"> # Patterns that should trigger builds on only some bots.
</span><span class="cx"> (r"(?:^|/)PlatformGTK\.cmake$", ["gtk"]),
</span><span class="cx"> (r"Mac\.(?:cpp|h|mm)$", ["mac"]),
</span><ins>+ (r"IOS\.(?:cpp|h|mm)$", ["ios"]),
</ins><span class="cx"> (r"\.(?:vcproj|vsprops|sln|vcxproj|props|filters)$", ["win"]),
</span><del>- (r"\.exp(?:\.in)?$", ["mac"]),
- (r"\.order$", ["mac"]),
</del><ins>+ (r"\.exp(?:\.in)?$", ["mac", "ios"]),
+ (r"\.order$", ["mac", "ios"]),
</ins><span class="cx"> (r"\.(?:vcproj|vcxproj)/", ["win"]),
</span><del>- (r"\.xcconfig$", ["mac"]),
- (r"\.xcodeproj/", ["mac"]),
</del><ins>+ (r"\.xcconfig$", ["mac", "ios"]),
+ (r"\.xcodeproj/", ["mac", "ios"]),
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> base_platform = target_platform.split("-")[0]
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuild_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (190370 => 190371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2015-09-30 22:28:08 UTC (rev 190370)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2015-09-30 23:03:28 UTC (rev 190371)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,7 +29,8 @@
</span><span class="cx"> (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit2/ChangeLog-2011-02-11"], []),
</span><span class="cx"> (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
</span><span class="cx"> (["Websites/bugs.webkit.org/foo"], []),
</span><del>- (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</del><ins>+ (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "ios-9", "ios-simulator-9"]),
+ (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "ios-9", "ios-simulator-9"]),
</ins><span class="cx"> (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
</span><span class="cx"> (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
</span><span class="cx"> (["LayoutTests/foo"], ["*"]),
</span><span class="lines">@@ -37,7 +38,10 @@
</span><span class="cx"> (["LayoutTests/platform/mac-mavericks/foo"], ["mac-mavericks"]),
</span><span class="cx"> (["LayoutTests/platform/mac-yosemite/foo"], ["mac-mavericks", "mac-yosemite"]),
</span><span class="cx"> (["LayoutTests/platform/mac-elcapitan/foo"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><del>- (["LayoutTests/platform/wk2/Skipped"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</del><ins>+ (["LayoutTests/platform/ios-simulator/foo"], ["ios-9", "ios-simulator-9"]),
+ (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-9", "ios-simulator-9"]),
+ (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-9", "ios-simulator-9"]),
+ (["LayoutTests/platform/wk2/Skipped"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "ios-9", "ios-simulator-9"]),
</ins><span class="cx"> (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><span class="cx"> (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><span class="cx"> (["LayoutTests/platform/mac/foo"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "win"]),
</span><span class="lines">@@ -45,12 +49,19 @@
</span><span class="cx"> (["LayoutTests/platform/win-xp/foo"], ["win"]),
</span><span class="cx"> (["LayoutTests/platform/win-wk1/foo"], ["win"]),
</span><span class="cx"> (["LayoutTests/platform/win/foo"], ["win"]),
</span><ins>+ (["LayoutTests/platform/spi/cocoa/foo"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "ios-9", "ios-simulator-9"]),
+ (["LayoutTests/platform/spi/cf/foo"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "win", "ios-9", "ios-simulator-9"]),
</ins><span class="cx"> (["Source/WebKit/mac/WebKit.mac.exp"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><ins>+ (["Source/WebKit/ios/WebKit.iOS.exp"], ["ios-9", "ios-simulator-9"]),
+ (["Source/Dummy/foo.exp"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "ios-9", "ios-simulator-9"]),
+ (["Source/WebCore/ios/foo"], ["ios-9", "ios-simulator-9"]),
</ins><span class="cx"> (["Source/WebCore/mac/foo"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><span class="cx"> (["Source/WebCore/win/foo"], ["win"]),
</span><ins>+ (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "ios-9", "ios-simulator-9"]),
</ins><span class="cx"> (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
</span><del>- (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], []),
</del><ins>+ (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-9", "ios-simulator-9"]),
</ins><span class="cx"> (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-mavericks", "mac-yosemite", "mac-elcapitan"]),
</span><ins>+ (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-9", "ios-simulator-9"]),
</ins><span class="cx"> (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -58,7 +69,7 @@
</span><span class="cx"> for files, platforms in self._should_build_tests:
</span><span class="cx"> # FIXME: We should test more platforms here once
</span><span class="cx"> # wkbuild._should_file_trigger_build is implemented for them.
</span><del>- for platform in ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "win"]:
</del><ins>+ for platform in ["mac-mavericks", "mac-yosemite", "mac-elcapitan", "win", "ios-9", "ios-simulator-9"]:
</ins><span class="cx"> should_build = platform in platforms or "*" in platforms
</span><span class="cx"> 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)))
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190370 => 190371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-30 22:28:08 UTC (rev 190370)
+++ trunk/Tools/ChangeLog 2015-09-30 23:03:28 UTC (rev 190371)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-09-30 Daniel Bates <dabates@apple.com>
+
+ Add iOS criterion for triggering a build
+ https://bugs.webkit.org/show_bug.cgi?id=149679
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ First pass at defining criterion for triggering an iOS build.
+
+ * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+ (_should_file_trigger_build):
+ * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+ (ShouldBuildTest):
+ (ShouldBuildTest.test_should_build):
+
</ins><span class="cx"> 2015-09-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Allow tests to generate user gestures for UI testing
</span></span></pre>
</div>
</div>
</body>
</html>