Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (106702 => 106703)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-02-03 23:53:23 UTC (rev 106702)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-02-04 00:01:12 UTC (rev 106703)
@@ -21,6 +21,7 @@
{ "name": "apple-xserve-2", "platform": "mac-lion" },
{ "name": "apple-xserve-3", "platform": "mac-lion" },
{ "name": "apple-xserve-10", "platform": "mac-lion" },
+ { "name": "apple-xserve-11", "platform": "mac-lion" },
{ "name": "apple-windows-1", "platform": "win"},
{ "name": "apple-windows-2", "platform": "win"},
@@ -110,7 +111,7 @@
},
{ "name": "Lion Intel Release (Build)", "type": "Build", "builddir": "lion-intel-release",
"platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
- "triggers": ["lion-intel-release-tests", "lion-intel-release-tests-wk2"],
+ "triggers": ["lion-intel-release-tests", "lion-intel-release-tests-wk2", "lion-intel-release-perf"],
"slavenames": ["apple-xserve-3"]
},
{ "name": "Lion Intel Debug (Tests)", "type": "Test", "builddir": "lion-intel-debug-tests",
@@ -130,6 +131,11 @@
"slavenames": ["apple-macpro-6"]
},
{
+ "name": "Lion Intel Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "lion-release-perf-tests",
+ "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["apple-xserve-11"]
+ },
+ {
"name": "Windows Release (Build)", "type": "Build", "builddir": "win-release",
"platform": "win", "configuration": "release", "architectures": ["i386"],
"triggers": ["win-release-tests", "win-release-tests-wk2"],
@@ -297,6 +303,9 @@
{ "type": "Triggerable", "name": "lion-intel-release-tests-wk2",
"builderNames": ["Lion Intel Release (WebKit2 Tests)"]
},
+ { "type": "Triggerable", "name": "lion-intel-release-perf",
+ "builderNames": ["Lion Intel Release (Perf)"]
+ },
{ "type": "Triggerable", "name": "lion-intel-debug-tests",
"builderNames": ["Lion Intel Debug (Tests)"]
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (106702 => 106703)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-02-03 23:53:23 UTC (rev 106702)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-02-04 00:01:12 UTC (rev 106703)
@@ -775,6 +775,14 @@
self.addStep(CompileWebKit)
self.addStep(RunAndUploadPerfTests)
+class DownloadAndPerfTestFactory(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(RunAndUploadPerfTests)
+
class PlatformSpecificScheduler(AnyBranchScheduler):
def __init__(self, platform, branch, **kwargs):
self.platform = platform