Rollout 161618.
authorlforschler@apple.com <lforschler@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Jan 2014 04:18:46 +0000 (04:18 +0000)
committerlforschler@apple.com <lforschler@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Jan 2014 04:18:46 +0000 (04:18 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161619 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index cbd01f07b4b966d607c619ada5f66f31a23eec69..ec1d3b52b3aaeb4de9c2e30c4a4e7579426085ef 100644 (file)
@@ -93,7 +93,7 @@
                       "platform": "mac-mavericks", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["apple-mini-142", "apple-mini-211"]
                     },
-                    { "name": "Apple Mavericks LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "mavericks-cloop-debug",
+                    { "name": "Apple Mavericks CLOOP (BuildAndTest)", "type": "BuildAndTestCLOOP", "builddir": "mavericks-cloop-debug",
                       "platform": "mac-mavericks", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["apple-mini-180"]
                     },
                       "builderNames": ["Apple MountainLion Release (Build)", "Apple MountainLion Debug (Build)", "Apple MountainLion Release (32-bit Build)"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "mac-mavericks", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple Mavericks Release (Build)", "Apple Mavericks Debug (Build)", "Apple Mavericks LLINT CLoop (BuildAndTest)"]
+                      "builderNames": ["Apple Mavericks Release (Build)", "Apple Mavericks Debug (Build)", "Apple Mavericks CLOOP (BuildAndTest)"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
index c123c209992090ed40f0dbf0cff248bd0e706eb7..286c88a08beae09e4c18e8a0f13b2e1691f593e1 100644 (file)
@@ -225,7 +225,7 @@ class CompileWebKit(shell.Compile):
                 self.addCompleteLog('errors', "".join(errors))
 
 
-class CompileLLINTCLoop(CompileWebKit):
+class CompileCLOOP(CompileWebKit):
     command = ["perl", "./Tools/Scripts/build-jsc", "--cloop", WithProperties("--%(configuration)s")]
 
 
@@ -557,7 +557,7 @@ class RunPerlTests(TestWithFailureCount):
         return 0
 
 
-class RunLLINTCloopTests(TestWithFailureCount):
+class RunCLOOPTests(TestWithFailureCount):
     name = "webkit-jsc-cloop-test"
     description = ["cloop-tests running"]
     descriptionDone = ["cloop-tests"]
@@ -839,13 +839,9 @@ class BuildAndTestFactory(Factory):
             self.addStep(UploadBuiltProduct())
             self.addStep(trigger.Trigger(schedulerNames=triggers))
 
-class BuildAndTestLLINTCLoopFactory(Factory):
-    CompileClass = CompileLLINTCLoop
-    LayoutTestClass = RunLLINTCloopTests
-    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(self.LayoutTestClass())
+class BuildAndTestCLOOPFactory(BuildAndTestFactory):
+    CompileClass = CompileCLOOP
+    LayoutTestClass = RunCLOOPTests
 
 class BuildAndTestWebKit2Factory(BuildAndTestFactory):
     CompileClass = CompileWebKit
index 89341ec3fb54749fea7a938d2666ee3301dd57c5..ba1433806b86d7df95cabd3eacf5261f51111246 100644 (file)
@@ -1,17 +1,3 @@
-2014-01-09  Lucas Forschler  <lforschler@apple.com>
-
-        Update the LLINT CLoop bot infrastructure.  
-        This will require a build master restart.
-        
-        Unreviewed. 
-        
-        * BuildSlaveSupport/build.webkit.org-config/config.json:
-        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
-        (CompileLLINTCLoop):
-        (RunLLINTCloopTests):
-        (BuildAndTestLLINTCLoopFactory):
-        (BuildAndTestLLINTCLoopFactory.__init__):
-
 2014-01-09  Dan Bernstein  <mitz@apple.com>
 
         [Cocoa] Promote WKBackForwardList{,Item}.h to public