diff options
Diffstat (limited to 'Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg')
| -rw-r--r-- | Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg index 4ee277c..7913095 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -72,11 +72,11 @@ class InstallChromiumDependencies(shell.ShellCommand): command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"] haltOnFailure = True -class CleanupChromiumLinuxCrashLogs(shell.ShellCommand): +class CleanupChromiumCrashLogs(shell.ShellCommand): name = "cleanup crash logs" description = ["removing crash logs"] descriptionDone = ["removed crash logs"] - command = ["sh", "-c", "rm -rf /tmp/.org.chromium.*"] + command = ["python", "./Tools/BuildSlaveSupport/chromium/remove-crash-logs"] haltOnFailure = False @@ -420,8 +420,9 @@ class Factory(factory.BuildFactory): factory.BuildFactory.__init__(self) self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly) self.addStep(CheckOutSource) - if platform == "win": + if platform in ("win", "chromium-win"): self.addStep(KillOldProcesses) + if platform == "win": self.addStep(InstallWin32Dependencies) if platform.startswith("chromium"): self.addStep(InstallChromiumDependencies) @@ -445,10 +446,9 @@ class TestFactory(Factory): self.addStep(self.TestClass, skipBuild=(platform == 'win')) # Tiger's Python 2.3 is too old. WebKit Python requires 2.5+. # Sadly we have no way to detect the version on the slave from here. - if platform != "mac-tiger" and platform != "chromium-win": + if platform != "mac-tiger": self.addStep(RunPythonTests) - if platform != "chromium-win": - self.addStep(RunPerlTests) + self.addStep(RunPerlTests) self.addStep(ArchiveTestResults) self.addStep(UploadTestResults) self.addStep(ExtractTestResults) @@ -457,8 +457,8 @@ class BuildAndTestFactory(Factory): TestClass = RunWebKitTests def __init__(self, platform, configuration, architectures): Factory.__init__(self, platform, configuration, architectures, False) - if platform == "chromium-linux": - self.addStep(CleanupChromiumLinuxCrashLogs) + if platform.startswith("chromium"): + self.addStep(CleanupChromiumCrashLogs) self.addStep(CompileWebKit) if not platform.startswith("chromium"): self.addStep(RunJavaScriptCoreTests) @@ -467,9 +467,14 @@ class BuildAndTestFactory(Factory): self.addStep(self.TestClass) # Tiger's Python 2.3 is too old. WebKit Python requires 2.5+. # Sadly we have no way to detect the version on the slave from here. + # 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 != "mac-tiger": self.addStep(RunPythonTests) - self.addStep(RunPerlTests) + # 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(ArchiveTestResults) self.addStep(UploadTestResults) self.addStep(ExtractTestResults) |