Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (136514 => 136515)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-12-04 17:32:01 UTC (rev 136514)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-12-04 17:39:03 UTC (rev 136515)
@@ -62,6 +62,7 @@
{ "name": "google-linux-perf", "platform": "chromium-linux" },
{ "name": "google-linux-android", "platform": "chromium-android" },
{ "name": "google-android-tests", "platform": "chromium-android" },
+ { "name": "google-android-perf", "platform": "chromium-android" },
{ "name": "wincairo-1", "platform": "wincairo" },
@@ -298,7 +299,8 @@
{
"name": "Chromium Android Release", "type": "Build", "builddir": "chromium-linux-android",
"platform": "chromium-android", "configuration": "release", "architectures": ["i386"],
- "triggers": ["chromium-android-release-tests"], "slavenames": ["google-linux-android"]
+ "triggers": ["chromium-android-release-tests", "chromium-android-release-perf"],
+ "slavenames": ["google-linux-android"]
},
{
"name": "Chromium Android Release (Tests)", "type": "Test", "builddir": "chromium-android-release-tests",
@@ -306,6 +308,11 @@
"slavenames": ["google-android-tests"]
},
{
+ "name": "Chromium Android Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-android-release-perf",
+ "platform": "chromium-android", "configuration": "release", "architectures": ["i386"],
+ "slavenames": ["google-android-perf"]
+ },
+ {
"name": "WinCairo Release", "type": "BuildAndTest", "builddir": "win-cairo-release",
"platform": "wincairo", "configuration": "release", "architectures": ["i386"],
"slavenames": ["wincairo-1"]
@@ -414,6 +421,9 @@
{ "type": "Triggerable", "name": "chromium-android-release-tests",
"builderNames": ["Chromium Android Release (Tests)"]
},
+ { "type": "Triggerable", "name": "chromium-android-release-perf",
+ "builderNames": ["Chromium Android Release (Perf)"]
+ },
{ "type": "Triggerable", "name": "gtk-linux-64-release-tests-wk2",
"builderNames": ["GTK Linux 64-bit Release WK2 (Tests)"]
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (136514 => 136515)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-12-04 17:32:01 UTC (rev 136514)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-12-04 17:39:03 UTC (rev 136515)
@@ -854,6 +854,8 @@
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
+ if platform == "chromium-android":
+ self.addStep(OutputAndroidDeviceStatus())
self.addStep(RunAndUploadPerfTests())
class DownloadAndPerfTestWebKit2Factory(Factory):