Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (111402 => 111403)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-03-20 16:28:29 UTC (rev 111402)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-03-20 16:33:53 UTC (rev 111403)
@@ -41,6 +41,7 @@
{ "name": "szeged-linux-2", "platform": "qt"},
{ "name": "szeged-linux-3", "platform": "qt"},
{ "name": "szeged-linux-4", "platform": "qt"},
+ { "name": "szeged-linux-5", "platform": "qt"},
{ "name": "szeged-windows-1", "platform": "qt"},
{ "name": "szeged-windows-2", "platform": "qt"},
@@ -189,6 +190,11 @@
"slavenames": ["szeged-linux-3"]
},
{
+ "name": "Qt Linux 64-bit Release (WebKit2 Perf)", "type": "BuildAndPerfTestWebKit2", "builddir": "qt-linux-64-release-wk2-perf-tests",
+ "platform": "qt", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["szeged-linux-5"]
+ },
+ {
"name": "Qt Linux ARMv7 Release", "type": "Build", "builddir": "qt-linux-armv7-release",
"platform": "qt", "configuration": "release", "architectures": ["armv7"],
"slavenames": ["szeged-linux-4"]
@@ -292,7 +298,8 @@
"schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "change_filter": "trunk_filter", "treeStableTimer": 45.0,
"builderNames": ["GTK Linux 32-bit Release", "GTK Linux 64-bit Release", "GTK Linux 64-bit Debug",
- "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux 64-bit Release (Perf)", "Qt Linux ARMv7 Release",
+ "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux 64-bit Release (Perf)",
+ "Qt Linux 64-bit Release (WebKit2 Perf)", "Qt Linux ARMv7 Release",
"Qt Windows 32-bit Release", "Qt Windows 32-bit Debug", "Qt SnowLeopard Release",
"Qt Linux MIPS Release", "Qt Linux SH4 Release",
"Chromium Win Release", "Chromium Win Release (Tests)", "Chromium Win Release (Perf)",
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (111402 => 111403)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-03-20 16:28:29 UTC (rev 111402)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-03-20 16:33:53 UTC (rev 111403)
@@ -640,6 +640,12 @@
return shell.Test.start(self)
+class RunAndUploadPerfTestsWebKit2(RunAndUploadPerfTests):
+ def start(self):
+ self.setCommand(self.command + ["--webkit-test-runner"])
+ return RunAndUploadPerfTests.start(self)
+
+
class ArchiveTestResults(shell.ShellCommand):
command = ["python", "./Tools/BuildSlaveSupport/test-result-archive",
WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"), "archive"]
@@ -787,6 +793,14 @@
self.addStep(CompileWebKit)
self.addStep(RunAndUploadPerfTests)
+class BuildAndPerfTestWebKit2Factory(Factory):
+ def __init__(self, platform, configuration, architectures, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
+ if platform.startswith("chromium"):
+ self.addStep(CleanupChromiumCrashLogs)
+ self.addStep(CompileWebKit)
+ self.addStep(RunAndUploadPerfTestsWebKit2)
+
class DownloadAndPerfTestFactory(Factory):
def __init__(self, platform, configuration, architectures, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
@@ -795,6 +809,14 @@
self.addStep(ExtractBuiltProduct)
self.addStep(RunAndUploadPerfTests)
+class DownloadAndPerfTestWebKit2Factory(Factory):
+ def __init__(self, platform, configuration, architectures, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
+ self.addStep(CreateWebKitBuildDirectory)
+ self.addStep(DownloadBuiltProduct)
+ self.addStep(ExtractBuiltProduct)
+ self.addStep(RunAndUploadPerfTestsWebKit2)
+
class PlatformSpecificScheduler(AnyBranchScheduler):
def __init__(self, platform, branch, **kwargs):
self.platform = platform
