Add supporting logic for r156570.
authorlforschler@apple.com <lforschler@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Sep 2013 22:05:40 +0000 (22:05 +0000)
committerlforschler@apple.com <lforschler@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Sep 2013 22:05:40 +0000 (22:05 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156579 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

index c7ebfcff95922884edab3738e7e58bc43c5c4141..3894aff47f9a3ae6a1865908ba23553852a88234 100644 (file)
@@ -94,15 +94,16 @@ class ConfigureBuild(buildstep.BuildStep):
     name = "configure build"
     description = ["configuring build"]
     descriptionDone = ["configured build"]
-    def __init__(self, platform, configuration, architecture, buildOnly, SVNMirror, *args, **kwargs):
+    def __init__(self, platform, configuration, architecture, buildOnly, additionalArguments, SVNMirror, *args, **kwargs):
         buildstep.BuildStep.__init__(self, *args, **kwargs)
         self.platform = platform.split('-', 1)[0]
         self.fullPlatform = platform
         self.configuration = configuration
         self.architecture = architecture
         self.buildOnly = buildOnly
+        self.additionalArguments = additionalArguments
         self.SVNMirror = SVNMirror
-        self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, SVNMirror=SVNMirror)
+        self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, additionalArguments=additionalArguments, SVNMirror=SVNMirror)
 
     def start(self):
         self.setProperty("platform", self.platform)
@@ -111,6 +112,7 @@ class ConfigureBuild(buildstep.BuildStep):
         self.setProperty("architecture", self.architecture)
         self.setProperty("buildOnly", self.buildOnly)
         self.setProperty("shouldAbortEarly", True)
+        self.setProperty("additionalArguments", self.additionalArguments)
         self.setProperty("SVNMirror", self.SVNMirror)
         self.finished(SUCCESS)
         return defer.succeed(None)
@@ -758,9 +760,9 @@ class ExtractTestResultsAndLeaks(ExtractTestResults):
 
 
 class Factory(factory.BuildFactory):
-    def __init__(self, platform, configuration, architectures, buildOnly, SVNMirror):
+    def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments, SVNMirror):
         factory.BuildFactory.__init__(self)
-        self.addStep(ConfigureBuild(platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, SVNMirror=SVNMirror))
+        self.addStep(ConfigureBuild(platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, additionalArguments=additionalArguments, SVNMirror=SVNMirror))
         if SVNMirror:
             self.addStep(WaitForSVNServer())
         self.addStep(CheckOutSource(SVNMirror=SVNMirror))
@@ -777,8 +779,8 @@ class Factory(factory.BuildFactory):
 
 
 class BuildFactory(Factory):
-    def __init__(self, platform, configuration, architectures, triggers=None, SVNMirror=None):
-        Factory.__init__(self, platform, configuration, architectures, True, SVNMirror)
+    def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None):
+        Factory.__init__(self, platform, configuration, architectures, True, additionalArguments, SVNMirror)
         self.addStep(CompileWebKit())
         if triggers:
             self.addStep(ArchiveBuiltProduct())
@@ -796,8 +798,8 @@ def pickLatestBuild(builder, requests):
 class TestFactory(Factory):
     LayoutTestClass = RunWebKitTests
     ExtractTestResultsClass = ExtractTestResults
-    def __init__(self, platform, configuration, architectures, SVNMirror=None):
-        Factory.__init__(self, platform, configuration, architectures, False, SVNMirror)
+    def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None):
+        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
         self.addStep(DownloadBuiltProduct())
         self.addStep(ExtractBuiltProduct())
         self.addStep(RunJavaScriptCoreTests(buildJSCTool=False))
@@ -824,8 +826,8 @@ class BuildAndTestFactory(Factory):
     CompileClass = CompileWebKit
     LayoutTestClass = RunWebKitTests
     ExtractTestResultsClass = ExtractTestResults
-    def __init__(self, platform, configuration, architectures, triggers=None, SVNMirror=None, **kwargs):
-        Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
+    def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
         self.addStep(self.CompileClass())
         self.addStep(RunJavaScriptCoreTests())
         if self.LayoutTestClass:
@@ -873,27 +875,27 @@ class TestWebKit2Factory(TestFactory):
     LayoutTestClass = RunWebKit2Tests
 
 class BuildAndPerfTestFactory(Factory):
-    def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs):
-        Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
+    def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
         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)
+    def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
         self.addStep(CompileWebKit())
         self.addStep(RunAndUploadPerfTestsWebKit2())
 
 class DownloadAndPerfTestFactory(Factory):
-    def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs):
-        Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
+    def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
         self.addStep(DownloadBuiltProduct())
         self.addStep(ExtractBuiltProduct())
         self.addStep(RunAndUploadPerfTests())
 
 class DownloadAndPerfTestWebKit2Factory(Factory):
-    def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs):
-        Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
+    def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
         self.addStep(DownloadBuiltProduct())
         self.addStep(ExtractBuiltProduct())
         self.addStep(RunAndUploadPerfTestsWebKit2())
@@ -961,7 +963,7 @@ def loadBuilderConfig(c):
         builderType = builder.pop('type')
         factory = globals()["%sFactory" % builderType]
         factorykwargs = {}
-        for key in "platform", "configuration", "architectures", "triggers", "SVNMirror":
+        for key in "platform", "configuration", "architectures", "triggers", "additionalArguments", "SVNMirror":
             value = builder.pop(key, None)
             if value:
                 factorykwargs[key] = value