Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (210538 => 210539)
--- 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)
@@ -70,6 +70,7 @@
{ "name": "gtk-linux-slave-6", "platform": "gtk" },
{ "name": "gtk-linux-slave-7", "platform": "gtk" },
{ "name": "gtk-linux-slave-8", "platform": "gtk" },
+ { "name": "gtk-linux-slave-9", "platform": "gtk" },
{ "name": "efl-linux-slave-2", "platform": "efl" },
{ "name": "efl-linux-slave-3", "platform": "efl" },
@@ -266,7 +267,7 @@
{
"name": "GTK Linux 64-bit Release (Build)", "type": "Build", "builddir": "gtk-linux-64-release",
"platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
- "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-perf-tests"],
+ "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-wayland-tests", "gtk-linux-64-release-perf-tests"],
"slavenames": ["gtk-linux-slave-2"]
},
{
@@ -293,9 +294,16 @@
{
"name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "gtk-linux-64-release-perf-tests",
"platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
+ "additionalArguments": ["--display-server=xorg"],
"slavenames": ["gtk-linux-slave-8"]
},
{
+ "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"]
+ },
+ {
"name": "WinCairo 64-Bit Release", "type": "Build", "builddir": "win-cairo-release",
"platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
"slavenames": ["wincairo-1"]
@@ -419,6 +427,9 @@
},
{ "type": "Triggerable", "name": "gtk-linux-64-release-perf-tests",
"builderNames": ["GTK Linux 64-bit Release (Perf)"]
+ },
+ { "type": "Triggerable", "name": "gtk-linux-64-release-wayland-tests",
+ "builderNames": ["GTK Linux 64-bit Release Wayland (Tests)"]
}
]
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (210538 => 210539)
--- 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)
@@ -579,6 +579,13 @@
descriptionDone = ["API tests"]
command = ["python", "./Tools/Scripts/run-gtk-tests", "--verbose", WithProperties("--%(configuration)s")]
+ def start(self):
+ additionalArguments = self.getProperty("additionalArguments")
+ if additionalArguments:
+ self.command += additionalArguments
+ self.setCommand(self.command)
+ return shell.Test.start(self)
+
def commandComplete(self, cmd):
shell.Test.commandComplete(self, cmd)
@@ -663,6 +670,9 @@
WithProperties("--%(configuration)s")]
def start(self):
+ additionalArguments = self.getProperty("additionalArguments")
+ if additionalArguments:
+ self.command += additionalArguments
self.setCommand(self.command)
return shell.Test.start(self)
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (210538 => 210539)
--- 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)
@@ -419,6 +419,7 @@
'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'],
'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'],
'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'],
+ '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'],
'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'],
'WinCairo 64-Bit Release' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
Modified: trunk/Tools/ChangeLog (210538 => 210539)
--- trunk/Tools/ChangeLog 2017-01-10 07:02:20 UTC (rev 210538)
+++ trunk/Tools/ChangeLog 2017-01-10 11:03:12 UTC (rev 210539)
@@ -1,3 +1,21 @@
+2017-01-10 Carlos Alberto Lopez Perez <[email protected]>
+
+ [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:
+
2017-01-09 Ryan Haddad <[email protected]>
Unreviewed, rolling out r210531.
