2009-12-02 Adam Barth <abarth@webkit.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Dec 2009 10:51:20 +0000 (10:51 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Dec 2009 10:51:20 +0000 (10:51 +0000)
        Reviewed by Eric Seidel.

        [bzt] build-attachment shouldn't check whether the builders are red
        https://bugs.webkit.org/show_bug.cgi?id=32062

        build-attachment doesn't touch the remote repository, so there isn't a
        need to hold off when the builders are red.

        * Scripts/modules/commands/download.py:
        * Scripts/modules/landingsequence.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/modules/commands/download.py
WebKitTools/Scripts/modules/landingsequence.py

index 33bda4d9daebc9965e7b20f48f166b674b74401e..74be115c07bb6231e8f704fa4dd7a126bbba6a54 100644 (file)
@@ -1,3 +1,16 @@
+2009-12-02  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] build-attachment shouldn't check whether the builders are red
+        https://bugs.webkit.org/show_bug.cgi?id=32062
+
+        build-attachment doesn't touch the remote repository, so there isn't a
+        need to hold off when the builders are red.
+
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/landingsequence.py:
+
 2009-12-02  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.
index ecaadd0a1663c9ec39df8a9f7f3945dab8523c29..a45632cf24a47987e4a9bf10eebcf07268f4f671 100644 (file)
@@ -129,6 +129,7 @@ class LandDiffSequence(ConditionalLandingSequence):
         ConditionalLandingSequence.__init__(self, patch, options, tool)
 
     def run(self):
+        self.check_builders()
         self.build()
         self.test()
         commit_log = self.commit()
index 7655eaaecee7fc41fd5cea564cdeb1bf5f7f6f8f..ecb231e226cccb699fa793311fdf79c980607932 100644 (file)
@@ -51,6 +51,7 @@ class LandingSequence:
         self.clean()
         self.update()
         self.apply_patch()
+        self.check_builders()
         self.build()
         self.test()
         commit_log = self.commit()
@@ -82,10 +83,10 @@ class LandingSequence:
         log("Processing patch %s from bug %s." % (self._patch["id"], self._patch["bug_id"]))
         self._tool.scm().apply_patch(self._patch, force=self._options.non_interactive)
 
-    def build(self):
-        # Make sure the tree is still green after updating, before building this patch.
-        # The first patch ends up checking tree status twice, but that's OK.
+    def check_builders(self):
         self._tool.steps.ensure_builders_are_green(self._tool.buildbot, self._options)
+
+    def build(self):
         self._tool.steps.build_webkit(quiet=self._options.quiet, port=self._port)
 
     def test(self):
@@ -120,6 +121,10 @@ class ConditionalLandingSequence(LandingSequence):
         if self._options.update:
             LandingSequence.update(self)
 
+    def check_builders(self):
+        if self._options.build:
+            LandingSequence.check_builders(self)
+
     def build(self):
         if self._options.build:
             LandingSequence.build(self)