<!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>[210539] 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/210539">210539</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2017-01-10 03:03:12 -0800 (Tue, 10 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add a new release test bot for Wayland and pass --display-server=xorg to the GTK Perf bot.
https://bugs.webkit.org/show_bug.cgi?id=166872
Reviewed by Michael Catanzaro.
Add the new wayland release test bot as a test-only bot. It will download the built product from the release build-only bot.
Define the required "--display-server=driver" in the bot additionalArguments config entry.
Implement support for honoring additionalArguments on the RunGtkAPITests and RunAndUploadPerfTests steps.
The step RunWebKitTests already has support for it.
* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunGtkAPITests.start):
(RunAndUploadPerfTests.start):
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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 (210538 => 210539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2017-01-10 07:02:20 UTC (rev 210538)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2017-01-10 11:03:12 UTC (rev 210539)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx"> { "name": "gtk-linux-slave-6", "platform": "gtk" },
</span><span class="cx"> { "name": "gtk-linux-slave-7", "platform": "gtk" },
</span><span class="cx"> { "name": "gtk-linux-slave-8", "platform": "gtk" },
</span><ins>+ { "name": "gtk-linux-slave-9", "platform": "gtk" },
</ins><span class="cx">
</span><span class="cx"> { "name": "efl-linux-slave-2", "platform": "efl" },
</span><span class="cx"> { "name": "efl-linux-slave-3", "platform": "efl" },
</span><span class="lines">@@ -266,7 +267,7 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "GTK Linux 64-bit Release (Build)", "type": "Build", "builddir": "gtk-linux-64-release",
</span><span class="cx"> "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
</span><del>- "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-perf-tests"],
</del><ins>+ "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-wayland-tests", "gtk-linux-64-release-perf-tests"],
</ins><span class="cx"> "slavenames": ["gtk-linux-slave-2"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -293,9 +294,16 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "gtk-linux-64-release-perf-tests",
</span><span class="cx"> "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
</span><ins>+ "additionalArguments": ["--display-server=xorg"],
</ins><span class="cx"> "slavenames": ["gtk-linux-slave-8"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "name": "GTK Linux 64-bit Release Wayland (Tests)", "type": "Test", "builddir": "gtk-linux-64-release-wayland-tests",
+ "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
+ "additionalArguments": ["--display-server=wayland"],
+ "slavenames": ["gtk-linux-slave-9"]
+ },
+ {
</ins><span class="cx"> "name": "WinCairo 64-Bit Release", "type": "Build", "builddir": "win-cairo-release",
</span><span class="cx"> "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["wincairo-1"]
</span><span class="lines">@@ -419,6 +427,9 @@
</span><span class="cx"> },
</span><span class="cx"> { "type": "Triggerable", "name": "gtk-linux-64-release-perf-tests",
</span><span class="cx"> "builderNames": ["GTK Linux 64-bit Release (Perf)"]
</span><ins>+ },
+ { "type": "Triggerable", "name": "gtk-linux-64-release-wayland-tests",
+ "builderNames": ["GTK Linux 64-bit Release Wayland (Tests)"]
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (210538 => 210539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2017-01-10 07:02:20 UTC (rev 210538)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2017-01-10 11:03:12 UTC (rev 210539)
</span><span class="lines">@@ -579,6 +579,13 @@
</span><span class="cx"> descriptionDone = ["API tests"]
</span><span class="cx"> command = ["python", "./Tools/Scripts/run-gtk-tests", "--verbose", WithProperties("--%(configuration)s")]
</span><span class="cx">
</span><ins>+ def start(self):
+ additionalArguments = self.getProperty("additionalArguments")
+ if additionalArguments:
+ self.command += additionalArguments
+ self.setCommand(self.command)
+ return shell.Test.start(self)
+
</ins><span class="cx"> def commandComplete(self, cmd):
</span><span class="cx"> shell.Test.commandComplete(self, cmd)
</span><span class="cx">
</span><span class="lines">@@ -663,6 +670,9 @@
</span><span class="cx"> WithProperties("--%(configuration)s")]
</span><span class="cx">
</span><span class="cx"> def start(self):
</span><ins>+ additionalArguments = self.getProperty("additionalArguments")
+ if additionalArguments:
+ self.command += additionalArguments
</ins><span class="cx"> self.setCommand(self.command)
</span><span class="cx"> return shell.Test.start(self)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (210538 => 210539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2017-01-10 07:02:20 UTC (rev 210538)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2017-01-10 11:03:12 UTC (rev 210539)
</span><span class="lines">@@ -419,6 +419,7 @@
</span><span class="cx"> 'GTK Linux 64-bit Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
</span><span class="cx"> 'GTK Linux 64-bit Release (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'perf-test', 'benchmark-test'],
</span><span class="cx"> 'GTK Linux 64-bit Release (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
</span><ins>+ 'GTK Linux 64-bit Release Wayland (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
</ins><span class="cx"> 'GTK Linux ARM Release' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'API tests'],
</span><span class="cx">
</span><span class="cx"> 'WinCairo 64-Bit Release' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210538 => 210539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-10 07:02:20 UTC (rev 210538)
+++ trunk/Tools/ChangeLog 2017-01-10 11:03:12 UTC (rev 210539)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-01-10 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] Add a new release test bot for Wayland and pass --display-server=xorg to the GTK Perf bot.
+ https://bugs.webkit.org/show_bug.cgi?id=166872
+
+ Reviewed by Michael Catanzaro.
+
+ Add the new wayland release test bot as a test-only bot. It will download the built product from the release build-only bot.
+ Define the required "--display-server=driver" in the bot additionalArguments config entry.
+ Implement support for honoring additionalArguments on the RunGtkAPITests and RunAndUploadPerfTests steps.
+ The step RunWebKitTests already has support for it.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunGtkAPITests.start):
+ (RunAndUploadPerfTests.start):
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+
</ins><span class="cx"> 2017-01-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r210531.
</span></span></pre>
</div>
</div>
</body>
</html>