Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (147980 => 147981)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2013-04-09 04:53:46 UTC (rev 147980)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2013-04-09 05:35:14 UTC (rev 147981)
@@ -44,23 +44,6 @@
{ "name": "oslo-mountainlion", "platform": "qt-5.0-mac-wk2"},
- { "name": "google-windows-1", "platform": "chromium-win" },
- { "name": "google-windows-2", "platform": "chromium-win" },
- { "name": "google-windows-3", "platform": "chromium-win" },
- { "name": "google-windows-4", "platform": "chromium-win" },
- { "name": "google-windows-perf", "platform": "chromium-win" },
- { "name": "google-mac-1", "platform": "chromium-mac" },
- { "name": "google-mac-2", "platform": "chromium-mac" },
- { "name": "google-mac-3", "platform": "chromium-mac" },
- { "name": "google-mac-4", "platform": "chromium-mac" },
- { "name": "google-mac-perf", "platform": "chromium-mac" },
- { "name": "google-linux-1", "platform": "chromium-linux" },
- { "name": "google-linux-2", "platform": "chromium-linux" },
- { "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" },
{ "name": "wince-1", "platform": "wince" },
@@ -243,70 +226,6 @@
"slavenames": ["oslo-mountainlion"]
},
{
- "name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release",
- "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
- "triggers": ["chromium-win-release-tests", "chromium-win-perf-tests"],
- "slavenames": ["google-windows-1", "google-windows-3"]
- },
- {
- "name": "Chromium Win Release (Tests)", "type": "Test", "builddir": "chromium-win-release-tests",
- "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["google-windows-2", "google-windows-4"]
- },
- {
- "name": "Chromium Win Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-win-perf-tests",
- "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["google-windows-perf"]
- },
- {
- "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release",
- "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
- "triggers": ["chromium-mac-release-tests", "chromium-mac-perf-tests"],
- "slavenames": ["google-mac-1", "google-mac-3"]
- },
- {
- "name": "Chromium Mac Release (Tests)", "type": "Test", "builddir": "chromium-mac-release-tests",
- "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["google-mac-2", "google-mac-4"]
- },
- {
- "name": "Chromium Mac Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-mac-perf-tests",
- "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["google-mac-perf"]
- },
- {
- "name": "Chromium Linux Release", "type": "Build", "builddir": "chromium-linux-release",
- "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
- "triggers": ["chromium-linux-release-tests", "chromium-linux-perf-tests"],
- "slavenames": ["google-linux-1"]
- },
- {
- "name": "Chromium Linux Release (Tests)", "type": "Test", "builddir": "chromium-linux-release-tests",
- "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["google-linux-2"]
- },
- {
- "name": "Chromium Linux Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-linux-perf-tests",
- "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["google-linux-perf"]
- },
- {
- "name": "Chromium Android Release", "type": "Build", "builddir": "chromium-linux-android",
- "platform": "chromium-android", "configuration": "release", "architectures": ["i386"],
- "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",
- "platform": "chromium-android", "configuration": "release", "architectures": ["i386"],
- "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"]
@@ -401,30 +320,6 @@
{ "type": "Triggerable", "name": "win-debug-tests",
"builderNames": ["Apple Win 7 Debug (Tests)"]
},
- { "type": "Triggerable", "name": "chromium-win-release-tests",
- "builderNames": ["Chromium Win Release (Tests)"]
- },
- { "type": "Triggerable", "name": "chromium-win-perf-tests",
- "builderNames": ["Chromium Win Release (Perf)"]
- },
- { "type": "Triggerable", "name": "chromium-mac-release-tests",
- "builderNames": ["Chromium Mac Release (Tests)"]
- },
- { "type": "Triggerable", "name": "chromium-mac-perf-tests",
- "builderNames": ["Chromium Mac Release (Perf)"]
- },
- { "type": "Triggerable", "name": "chromium-linux-release-tests",
- "builderNames": ["Chromium Linux Release (Tests)"]
- },
- { "type": "Triggerable", "name": "chromium-linux-perf-tests",
- "builderNames": ["Chromium Linux Release (Perf)"]
- },
- { "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 (147980 => 147981)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-04-09 04:53:46 UTC (rev 147980)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-04-09 05:35:14 UTC (rev 147981)
@@ -161,39 +161,7 @@
command = ["perl", "./Tools/Scripts/update-webkitgtk-libs"]
haltOnFailure = True
-class InstallChromiumDependencies(shell.ShellCommand):
- name = "gclient"
- description = ["updating chromium dependencies"]
- descriptionDone = ["updated chromium dependencies"]
- command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"]
- haltOnFailure = True
- def start(self):
- if self.getProperty('fullPlatform') == "chromium-android":
- self.setCommand(self.command + ['--chromium-android'])
- return shell.ShellCommand.start(self)
-
-class CleanupChromiumCrashLogs(shell.ShellCommand):
- name = "cleanup crash logs"
- description = ["removing crash logs"]
- descriptionDone = ["removed crash logs"]
- command = ["python", "./Tools/BuildSlaveSupport/chromium/remove-crash-logs"]
- haltOnFailure = False
-
-class OutputAndroidDeviceStatus(shell.ShellCommand):
- name = "android device status"
- description = ["outputting android device status"]
- descriptionDone = ["outputted android device status"]
- command = ["python", "./Tools/BuildSlaveSupport/chromium/output-android-device-status"]
- haltOnFailure = False
-
-def appendCustomBuildFlags(step, platform, fullPlatform=""):
- if fullPlatform == "chromium-android":
- step.setCommand(step.command + ['--chromium-android'])
- elif platform in ('chromium', 'efl', 'gtk', 'qt', 'wincairo', 'wince', 'wx'):
- step.setCommand(step.command + ['--' + platform])
-
-
class CompileWebKit(shell.Compile):
command = ["perl", "./Tools/Scripts/build-webkit", WithProperties("--%(configuration)s")]
env = {'MFLAGS':''}
@@ -454,10 +422,6 @@
self.setCommand(self.command + ['--no-build'])
if platform.startswith('mac'):
self.setCommand(self.command + ['--no-build'])
- if platform.startswith('chromium'):
- self.setCommand(self.command + ['--chromium'])
- if platform == 'chromium-android':
- self.setCommand(self.command + ['--chromium-android'])
return shell.Test.start(self)
def countFailures(self, cmd):
@@ -665,14 +629,6 @@
return RunWebKitTests.start(self)
-class RunChromiumWebKitUnitTests(shell.Test):
- name = "webkit-unit-tests"
- description = ["webkit-unit-tests running"]
- descriptionDone = ["webkit-unit-tests"]
- command = ["perl", "./Tools/Scripts/run-chromium-webkit-unit-tests",
- WithProperties("--%(configuration)s"), WithProperties("--platform=%(fullPlatform)s")]
-
-
class RunAndUploadPerfTests(shell.Test):
name = "perf-test"
description = ["perf-tests running"]
@@ -764,8 +720,6 @@
self.addStep(DeleteStaleBuildFiles())
if platform == "win":
self.addStep(InstallWin32Dependencies())
- if platform.startswith("chromium"):
- self.addStep(InstallChromiumDependencies())
if platform == "gtk":
self.addStep(InstallGtkDependencies())
if platform == "efl":
@@ -784,7 +738,7 @@
def unitTestsSupported(configuration, platform):
if platform.startswith('mac') and configuration == "release":
return False; # https://bugs.webkit.org/show_bug.cgi?id=82652
- return (platform == 'win' or platform.startswith('mac') or platform.startswith('chromium'))
+ return platform == 'win' or platform.startswith('mac')
def pickLatestBuild(builder, requests):
return max(requests, key=operator.attrgetter("submittedAt"))
@@ -794,26 +748,16 @@
ExtractTestResultsClass = ExtractTestResults
def __init__(self, platform, configuration, architectures, SVNMirror=None):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror)
- if platform.startswith("chromium"):
- self.addStep(CleanupChromiumCrashLogs())
- if platform == "chromium-android":
- self.addStep(OutputAndroidDeviceStatus())
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
- if not platform.startswith("chromium"):
- self.addStep(RunJavaScriptCoreTests(buildJSCTool=False))
- if platform.startswith("chromium"):
- self.addStep(RunChromiumWebKitUnitTests())
+ self.addStep(RunJavaScriptCoreTests(buildJSCTool=False))
self.addStep(self.TestClass(buildJSCTool=(platform != 'win')))
if unitTestsSupported(configuration, platform):
self.addStep(RunUnitTests())
self.addStep(RunPythonTests())
- # Chromium Win runs in non-Cygwin environment, which is not yet fit
- # for running tests. This can be removed once bug 48166 is fixed.
- if platform != "chromium-win":
- self.addStep(RunPerlTests())
- self.addStep(RunBindingsTests())
+ self.addStep(RunPerlTests())
+ self.addStep(RunBindingsTests())
self.addStep(ArchiveTestResults())
self.addStep(UploadTestResults())
self.addStep(self.ExtractTestResultsClass())
@@ -830,22 +774,14 @@
ExtractTestResultsClass = ExtractTestResults
def __init__(self, platform, configuration, architectures, triggers=None, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
- if platform.startswith("chromium"):
- self.addStep(CleanupChromiumCrashLogs)
self.addStep(self.CompileClass())
- if not platform.startswith("chromium"):
- self.addStep(RunJavaScriptCoreTests())
- if platform.startswith("chromium"):
- self.addStep(RunChromiumWebKitUnitTests)
+ self.addStep(RunJavaScriptCoreTests())
self.addStep(self.TestClass())
if unitTestsSupported(configuration, platform):
self.addStep(RunUnitTests())
self.addStep(RunPythonTests())
- # Chromium Win runs in non-Cygwin environment, which is not yet fit
- # for running tests. This can be removed once bug 48166 is fixed.
- if platform != "chromium-win":
- self.addStep(RunPerlTests())
- self.addStep(RunBindingsTests())
+ self.addStep(RunPerlTests())
+ self.addStep(RunBindingsTests())
self.addStep(ArchiveTestResults())
self.addStep(UploadTestResults())
self.addStep(self.ExtractTestResultsClass())
@@ -882,16 +818,12 @@
class BuildAndPerfTestFactory(Factory):
def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
- if platform.startswith("chromium"):
- self.addStep(CleanupChromiumCrashLogs)
self.addStep(CompileWebKit())
self.addStep(RunAndUploadPerfTests())
class BuildAndPerfTestWebKit2Factory(Factory):
def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
- if platform.startswith("chromium"):
- self.addStep(CleanupChromiumCrashLogs)
self.addStep(CompileWebKit())
self.addStep(RunAndUploadPerfTestsWebKit2())
@@ -900,8 +832,6 @@
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):
@@ -981,9 +911,7 @@
builder["factory"] = factory(**factorykwargs)
- if platform.startswith('chromium'):
- builder["category"] = 'Chromium'
- elif platform.startswith('mac'):
+ if platform.startswith('mac'):
builder["category"] = 'AppleMac'
elif platform == 'win':
builder["category"] = 'AppleWin'
