From 5ca1ceb3c5e97f956b96f888ff734890f06e5184 Mon Sep 17 00:00:00 2001 From: "ossy@webkit.org" Date: Tue, 3 Jul 2012 13:00:46 +0000 Subject: [PATCH] master.cfg cleanup, pass BuildStep instances instead of BuildStep subclasses https://bugs.webkit.org/show_bug.cgi?id=89001 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Szilard Ledan on 2012-07-03 Reviewed by Csaba Osztrogonác. * BuildSlaveSupport/build.webkit.org-config/master.cfg: (UploadBuiltProduct.__init__): (UploadTestResults.__init__): (ExtractTestResults.__init__): (Factory.__init__): (BuildFactory.__init__): (TestFactory.__init__): (BuildAndTestFactory.__init__): (BuildAndPerfTestFactory.__init__): (BuildAndPerfTestWebKit2Factory.__init__): (DownloadAndPerfTestFactory.__init__): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121760 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- .../build.webkit.org-config/master.cfg | 111 +++++++++++---------- Tools/ChangeLog | 19 ++++ 2 files changed, 78 insertions(+), 52 deletions(-) diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg index e1a8972..dd34bd1 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -216,8 +216,11 @@ class UploadBuiltProduct(transfer.FileUpload): masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(got_revision)s.zip") haltOnFailure = True - def __init__(self): - transfer.FileUpload.__init__(self, self.slavesrc, self.masterdest, mode=0644) + def __init__(self, **kwargs): + kwargs['slavesrc'] = self.slavesrc + kwargs['masterdest'] = self.masterdest + kwargs['mode'] = 0644 + transfer.FileUpload.__init__(self, **kwargs) class DownloadBuiltProduct(shell.ShellCommand): @@ -633,8 +636,11 @@ class UploadTestResults(transfer.FileUpload): slavesrc = "layout-test-results.zip" masterdest = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s).zip") - def __init__(self): - transfer.FileUpload.__init__(self, self.slavesrc, self.masterdest, mode=0644) + def __init__(self, **kwargs): + kwargs['slavesrc'] = self.slavesrc + kwargs['masterdest'] = self.masterdest + kwargs['mode'] = 0644 + transfer.FileUpload.__init__(self, **kwargs) class ExtractTestResults(master.MasterShellCommand): @@ -642,8 +648,9 @@ class ExtractTestResults(master.MasterShellCommand): resultDirectory = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s)") descriptionDone = ["uploaded results"] - def __init__(self): - master.MasterShellCommand.__init__(self, "") + def __init__(self, **kwargs): + kwargs['command'] = "" + master.MasterShellCommand.__init__(self, **kwargs) def resultDirectoryURL(self): return self.build.getProperties().render(self.resultDirectory).replace("public_html/", "/") + "/" @@ -671,29 +678,29 @@ class ExtractTestResultsAndLeaks(ExtractTestResults): class Factory(factory.BuildFactory): def __init__(self, platform, configuration, architectures, buildOnly): factory.BuildFactory.__init__(self) - self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly) + self.addStep(ConfigureBuild(platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly)) self.addStep(CheckOutSource()) # There are multiple Qt slaves running on same machines, so buildslaves shouldn't kill the processes of other slaves. if not platform.startswith("qt"): - self.addStep(KillOldProcesses) + self.addStep(KillOldProcesses()) if platform == "win": - self.addStep(InstallWin32Dependencies) + self.addStep(InstallWin32Dependencies()) if platform.startswith("chromium"): - self.addStep(InstallChromiumDependencies) + self.addStep(InstallChromiumDependencies()) if platform == "gtk": - self.addStep(InstallGtkDependencies) + self.addStep(InstallGtkDependencies()) if platform == "efl": - self.addStep(InstallEflDependencies) + self.addStep(InstallEflDependencies()) class BuildFactory(Factory): def __init__(self, platform, configuration, architectures, triggers=None): Factory.__init__(self, platform, configuration, architectures, True) - self.addStep(CompileWebKit) + self.addStep(CompileWebKit()) if triggers: - self.addStep(ArchiveBuiltProduct) - self.addStep(UploadBuiltProduct) - self.addStep(trigger.Trigger, schedulerNames=triggers) + self.addStep(ArchiveBuiltProduct()) + self.addStep(UploadBuiltProduct()) + self.addStep(trigger.Trigger(schedulerNames=triggers)) def unitTestsSupported(configuration, platform): if platform.startswith('mac') and configuration == "release": @@ -710,28 +717,28 @@ class TestFactory(Factory): def __init__(self, platform, configuration, architectures): Factory.__init__(self, platform, configuration, architectures, False) if platform.startswith("chromium"): - self.addStep(CleanupChromiumCrashLogs) - self.addStep(DownloadBuiltProduct) - self.addStep(ExtractBuiltProduct) + self.addStep(CleanupChromiumCrashLogs()) + self.addStep(DownloadBuiltProduct()) + self.addStep(ExtractBuiltProduct()) if not platform.startswith("chromium"): - self.addStep(RunJavaScriptCoreTests, buildJSCTool=False) + self.addStep(RunJavaScriptCoreTests(buildJSCTool=False)) if platform.startswith("chromium"): - self.addStep(RunChromiumWebKitUnitTests) - self.addStep(self.TestClass, buildJSCTool=(platform != 'win')) + self.addStep(RunChromiumWebKitUnitTests()) + self.addStep(self.TestClass(buildJSCTool=(platform != 'win'))) if unitTestsSupported(configuration, platform): - self.addStep(RunUnitTests) - self.addStep(RunPythonTests) + 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(ArchiveTestResults) - self.addStep(UploadTestResults) - self.addStep(self.ExtractTestResultsClass) + self.addStep(RunPerlTests()) + self.addStep(RunBindingsTests()) + self.addStep(ArchiveTestResults()) + self.addStep(UploadTestResults()) + self.addStep(self.ExtractTestResultsClass()) if platform == "gtk": - self.addStep(RunGtkAPITests) + self.addStep(RunGtkAPITests()) if platform.startswith("qt"): self.addStep(RunQtAPITests) @@ -742,31 +749,31 @@ class BuildAndTestFactory(Factory): Factory.__init__(self, platform, configuration, architectures, False, **kwargs) if platform.startswith("chromium"): self.addStep(CleanupChromiumCrashLogs) - self.addStep(CompileWebKit) + self.addStep(CompileWebKit()) if not platform.startswith("chromium"): - self.addStep(RunJavaScriptCoreTests) + self.addStep(RunJavaScriptCoreTests()) if platform.startswith("chromium"): self.addStep(RunChromiumWebKitUnitTests) - self.addStep(self.TestClass) + self.addStep(self.TestClass()) if unitTestsSupported(configuration, platform): - self.addStep(RunUnitTests) - self.addStep(RunPythonTests) + 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(ArchiveTestResults) - self.addStep(UploadTestResults) - self.addStep(self.ExtractTestResultsClass) + self.addStep(RunPerlTests()) + self.addStep(RunBindingsTests()) + self.addStep(ArchiveTestResults()) + self.addStep(UploadTestResults()) + self.addStep(self.ExtractTestResultsClass()) if platform == "gtk": - self.addStep(RunGtkAPITests) + self.addStep(RunGtkAPITests()) if platform.startswith("qt"): - self.addStep(RunQtAPITests) + self.addStep(RunQtAPITests()) if triggers: - self.addStep(ArchiveBuiltProduct) - self.addStep(UploadBuiltProduct) - self.addStep(trigger.Trigger, schedulerNames=triggers) + self.addStep(ArchiveBuiltProduct()) + self.addStep(UploadBuiltProduct()) + self.addStep(trigger.Trigger(schedulerNames=triggers)) class BuildAndTestLeaksFactory(BuildAndTestFactory): TestClass = RunWebKitLeakTests @@ -781,23 +788,23 @@ class BuildAndPerfTestFactory(Factory): Factory.__init__(self, platform, configuration, architectures, False, **kwargs) if platform.startswith("chromium"): self.addStep(CleanupChromiumCrashLogs) - self.addStep(CompileWebKit) - self.addStep(RunAndUploadPerfTests) + 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) + self.addStep(CompileWebKit()) + self.addStep(RunAndUploadPerfTestsWebKit2()) class DownloadAndPerfTestFactory(Factory): def __init__(self, platform, configuration, architectures, **kwargs): Factory.__init__(self, platform, configuration, architectures, False, **kwargs) - self.addStep(DownloadBuiltProduct) - self.addStep(ExtractBuiltProduct) - self.addStep(RunAndUploadPerfTests) + self.addStep(DownloadBuiltProduct()) + self.addStep(ExtractBuiltProduct()) + self.addStep(RunAndUploadPerfTests()) class DownloadAndPerfTestWebKit2Factory(Factory): def __init__(self, platform, configuration, architectures, **kwargs): diff --git a/Tools/ChangeLog b/Tools/ChangeLog index dfc8afa..5c782b0 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,22 @@ +2012-07-03 Szilard Ledan + + master.cfg cleanup, pass BuildStep instances instead of BuildStep subclasses + https://bugs.webkit.org/show_bug.cgi?id=89001 + + Reviewed by Csaba Osztrogonác. + + * BuildSlaveSupport/build.webkit.org-config/master.cfg: + (UploadBuiltProduct.__init__): + (UploadTestResults.__init__): + (ExtractTestResults.__init__): + (Factory.__init__): + (BuildFactory.__init__): + (TestFactory.__init__): + (BuildAndTestFactory.__init__): + (BuildAndPerfTestFactory.__init__): + (BuildAndPerfTestWebKit2Factory.__init__): + (DownloadAndPerfTestFactory.__init__): + 2012-07-03 Ádám Kallai Update unit test after r121724. -- 2.7.4