<!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>[166427] 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/166427">166427</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-28 14:38:25 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove WebKit1 GTK+ bots
https://bugs.webkit.org/show_bug.cgi?id=130904
Reviewed by Anders Carlsson.
* BuildSlaveSupport/build.webkit.org-config/config.json: Remove references to GTK+ WebKit1 test bot and ensure
all bots are testing WebKit2 only.
* Scripts/webkitpy/common/config/ews.json: Remove references to GTK+ WK1 EWS.
* Scripts/webkitpy/common/config/ports.py: Remove references to GTK+ WK1 bots.
* Scripts/webkitpy/common/config/ports_unittest.py: Ditto.
* Scripts/webkitpy/port/builders.py: Ditto.
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py: Ditto.
* TestResultServer/static-dashboards/builders.jsonp: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigewsjson">trunk/Tools/Scripts/webkitpy/common/config/ews.json</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigportspy">trunk/Tools/Scripts/webkitpy/common/config/ports.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigports_unittestpy">trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbuilderspy">trunk/Tools/Scripts/webkitpy/port/builders.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsrebaseline_unittestpy">trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py</a></li>
<li><a href="#trunkToolsTestResultServerstaticdashboardsbuildersjsonp">trunk/Tools/TestResultServer/static-dashboards/builders.jsonp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (166426 => 166427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-03-28 21:20:34 UTC (rev 166426)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-03-28 21:38:25 UTC (rev 166427)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> { "name": "gtk-linux-slave-1", "platform": "gtk"},
</span><span class="cx"> { "name": "gtk-linux-slave-2", "platform": "gtk"},
</span><span class="cx"> { "name": "gtk-linux-slave-3", "platform": "gtk"},
</span><del>- { "name": "gtk-linux-slave-4", "platform": "gtk"},
</del><span class="cx"> { "name": "gtk-linux-slave-5", "platform": "gtk"},
</span><span class="cx">
</span><span class="cx"> { "name": "wincairo-1", "platform": "wincairo" },
</span><span class="lines">@@ -152,22 +151,17 @@
</span><span class="cx"> "slavenames": ["gtk-linux-slave-1"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "GTK Linux 64-bit Release", "type": "BuildAndTestWebKit2", "builddir": "gtk-linux-64-release",
</del><ins>+ "name": "GTK Linux 64-bit Release", "type": "BuildAndTestWebKit2Only", "builddir": "gtk-linux-64-release",
</ins><span class="cx"> "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "triggers": ["gtk-linux-64-release-tests-wk1"],
</span><span class="cx"> "slavenames": ["gtk-linux-slave-2"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "GTK Linux 64-bit Debug WK1", "type": "BuildAndTestWebKit1Only", "builddir": "gtk-linux-64-debug-wk1",
</del><ins>+ "name": "GTK Linux 64-bit Debug", "type": "BuildAndTestWebKit2Only", "builddir": "gtk-linux-64-debug",
</ins><span class="cx"> "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["gtk-linux-slave-3"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "GTK Linux 64-bit Release WK1 (Tests)", "type": "Test", "builddir": "gtk-linux-64-release-tests-wk1",
- "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
- "slavenames": ["gtk-linux-slave-4"]
- },
- {
</del><span class="cx"> "name": "GTK Linux ARM Release", "type": "BuildAndNonLayoutTest", "builddir": "gtk-linux-arm-release",
</span><span class="cx"> "platform": "gtk", "configuration": "release", "architectures": ["armv7"],
</span><span class="cx"> "slavenames": ["gtk-linux-slave-5"]
</span><span class="lines">@@ -207,7 +201,7 @@
</span><span class="cx"> ],
</span><span class="cx">
</span><span class="cx"> "schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "change_filter": "trunk_filter", "treeStableTimer": 45.0,
</span><del>- "builderNames": ["GTK Linux 32-bit Release", "GTK Linux 64-bit Release", "GTK Linux 64-bit Debug WK1", "GTK Linux ARM Release",
</del><ins>+ "builderNames": ["GTK Linux 32-bit Release", "GTK Linux 64-bit Release", "GTK Linux 64-bit Debug", "GTK Linux ARM Release",
</ins><span class="cx"> "EFL Linux 64-bit Release WK1", "EFL Linux 64-bit Release WK2", "EFL Linux 32-bit Release (Build)",
</span><span class="cx"> "EFL Linux ARMv7 Thumb2 Release (Build)", "EFL Linux ARMv7 Traditional Release (Build)", "WinCairo Release"]
</span><span class="cx"> },
</span><span class="lines">@@ -258,9 +252,6 @@
</span><span class="cx"> },
</span><span class="cx"> { "type": "Triggerable", "name": "win-debug-tests",
</span><span class="cx"> "builderNames": ["Apple Win 7 Debug (Tests)"]
</span><del>- },
- { "type": "Triggerable", "name": "gtk-linux-64-release-tests-wk1",
- "builderNames": ["GTK Linux 64-bit Release WK1 (Tests)"]
</del><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166426 => 166427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-28 21:20:34 UTC (rev 166426)
+++ trunk/Tools/ChangeLog 2014-03-28 21:38:25 UTC (rev 166427)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-28 Martin Robinson <mrobinson@igalia.com>
+
+ Remove WebKit1 GTK+ bots
+ https://bugs.webkit.org/show_bug.cgi?id=130904
+
+ Reviewed by Anders Carlsson.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json: Remove references to GTK+ WebKit1 test bot and ensure
+ all bots are testing WebKit2 only.
+ * Scripts/webkitpy/common/config/ews.json: Remove references to GTK+ WK1 EWS.
+ * Scripts/webkitpy/common/config/ports.py: Remove references to GTK+ WK1 bots.
+ * Scripts/webkitpy/common/config/ports_unittest.py: Ditto.
+ * Scripts/webkitpy/port/builders.py: Ditto.
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py: Ditto.
+ * TestResultServer/static-dashboards/builders.jsonp: Ditto.
+
</ins><span class="cx"> 2014-03-28 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Brian Burg's apple.com email address.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigewsjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ews.json (166426 => 166427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ews.json 2014-03-28 21:20:34 UTC (rev 166426)
+++ trunk/Tools/Scripts/webkitpy/common/config/ews.json 2014-03-28 21:38:25 UTC (rev 166427)
</span><span class="lines">@@ -1,10 +1,4 @@
</span><span class="cx"> {
</span><del>- "GTK EWS": {
- "port": "gtk",
- "watchers": [
- "xan.lopez@gmail.com"
- ]
- },
</del><span class="cx"> "GTK WK2 EWS": {
</span><span class="cx"> "port": "gtk-wk2",
</span><span class="cx"> "watchers": [
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (166426 => 166427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2014-03-28 21:20:34 UTC (rev 166426)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2014-03-28 21:38:25 UTC (rev 166427)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> @staticmethod
</span><span class="cx"> def port(port_name):
</span><span class="cx"> ports = {
</span><del>- "gtk": GtkPort,
</del><span class="cx"> "gtk-wk2": GtkWK2Port,
</span><span class="cx"> "mac": MacPort,
</span><span class="cx"> "mac-wk2": MacWK2Port,
</span><span class="lines">@@ -142,23 +141,6 @@
</span><span class="cx"> return None
</span><span class="cx">
</span><span class="cx">
</span><del>-class GtkPort(DeprecatedPort):
- port_flag_name = "gtk"
-
- def build_webkit_command(self, build_style=None):
- command = super(GtkPort, self).build_webkit_command(build_style=build_style)
- command.append("--gtk")
- command.append("--update-gtk")
- command.append("--no-webkit2")
- command.append(super(GtkPort, self).makeArgs())
- return command
-
- def run_webkit_tests_command(self):
- command = super(GtkPort, self).run_webkit_tests_command()
- command.append("--gtk")
- return command
-
-
</del><span class="cx"> class GtkWK2Port(DeprecatedPort):
</span><span class="cx"> port_flag_name = "gtk-wk2"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigports_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (166426 => 166427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2014-03-28 21:20:34 UTC (rev 166426)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2014-03-28 21:38:25 UTC (rev 166427)
</span><span class="lines">@@ -39,12 +39,6 @@
</span><span class="cx"> self.assertEqual(MacPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug"])
</span><span class="cx"> self.assertEqual(MacPort().build_webkit_command(build_style="release"), DeprecatedPort().script_shell_command("build-webkit") + ["--release"])
</span><span class="cx">
</span><del>- def test_gtk_port(self):
- self.assertEqual(GtkPort().flag(), "--port=gtk")
- self.assertEqual(GtkPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk"])
- self.assertEqual(GtkPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit2", DeprecatedPort().makeArgs()])
- self.assertEqual(GtkPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit2", DeprecatedPort().makeArgs()])
-
</del><span class="cx"> def test_gtk_wk2_port(self):
</span><span class="cx"> self.assertEqual(GtkWK2Port().flag(), "--port=gtk-wk2")
</span><span class="cx"> self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbuilderspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/builders.py (166426 => 166427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/builders.py 2014-03-28 21:20:34 UTC (rev 166426)
+++ trunk/Tools/Scripts/webkitpy/port/builders.py 2014-03-28 21:38:25 UTC (rev 166427)
</span><span class="lines">@@ -67,10 +67,9 @@
</span><span class="cx"> # FIXME: Remove rebaseline_override_dir once there is an Apple buildbot that corresponds to platform/win.
</span><span class="cx"> "Apple Win 7 Release (Tests)": {"port_name": "win-7sp0", "is_debug": False, "rebaseline_override_dir": "win"},
</span><span class="cx">
</span><del>- "GTK Linux 32-bit Release": {"port_name": "gtk", "is_debug": False},
- "GTK Linux 64-bit Debug WK1": {"port_name": "gtk", "is_debug": True},
</del><ins>+ "GTK Linux 32-bit Release": {"port_name": "gtk-wk2", "is_debug": False},
+ "GTK Linux 64-bit Debug": {"port_name": "gtk-wk2", "is_debug": True},
</ins><span class="cx"> "GTK Linux 64-bit Release": {"port_name": "gtk-wk2", "is_debug": False},
</span><del>- "GTK Linux 64-bit Release WK1 (Tests)": {"port_name": "gtk", "is_debug": False},
</del><span class="cx">
</span><span class="cx"> "EFL Linux 64-bit Release": {"port_name": "efl", "is_debug": False},
</span><span class="cx"> "EFL Linux 64-bit Release WK2": {"port_name": "efl-wk2", "is_debug": False},
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsrebaseline_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (166426 => 166427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-03-28 21:20:34 UTC (rev 166426)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-03-28 21:38:25 UTC (rev 166427)
</span><span class="lines">@@ -91,8 +91,7 @@
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
</span><del>- self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug WK1"), "/mock-checkout/LayoutTests/platform/gtk-wk1")
- self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk1")
</del><ins>+ self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
</ins><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl-wk2")
</span><span class="cx">
</span><span class="lines">@@ -319,7 +318,7 @@
</span><span class="cx"> # FIXME: change this to use the test- ports.
</span><span class="cx"> calls = self.tool.executive.calls
</span><span class="cx"> self.assertEqual(len(calls), 1)
</span><del>- self.assertEqual(len(calls[0]), 24)
</del><ins>+ self.assertEqual(len(calls[0]), 22)
</ins><span class="cx">
</span><span class="cx"> def test_rebaseline_expectations_noop(self):
</span><span class="cx"> self._zero_out_test_expectations()
</span></span></pre></div>
<a id="trunkToolsTestResultServerstaticdashboardsbuildersjsonp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestResultServer/static-dashboards/builders.jsonp (166426 => 166427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestResultServer/static-dashboards/builders.jsonp 2014-03-28 21:20:34 UTC (rev 166426)
+++ trunk/Tools/TestResultServer/static-dashboards/builders.jsonp 2014-03-28 21:38:25 UTC (rev 166427)
</span><span class="lines">@@ -20,10 +20,9 @@
</span><span class="cx"> "EFL Linux 64-bit Debug WK2",
</span><span class="cx"> "EFL Linux 64-bit Release",
</span><span class="cx"> "EFL Linux 64-bit Release WK2",
</span><del>- "GTK Linux 32-bit Release",
- "GTK Linux 64-bit Debug WK1",
- "GTK Linux 64-bit Release",
- "GTK Linux 64-bit Release WK2 (Tests)",
</del><ins>+ "GTK Linux 32-bit Release",
+ "GTK Linux 64-bit Debug",
+ "GTK Linux 64-bit Release",
</ins><span class="cx"> "WinCairo Release"
</span><span class="cx"> ]
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>