Mac Debug EWS never finishes when there are failures
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Oct 2015 17:19:22 +0000 (17:19 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Oct 2015 17:19:22 +0000 (17:19 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150334

Reviewed by Daniel Bates.

* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
* Scripts/webkitpy/tool/commands/queues.py:

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

Tools/ChangeLog
Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
Tools/Scripts/webkitpy/tool/commands/queues.py

index 9a2ace8..a6012fb 100644 (file)
@@ -1,3 +1,13 @@
+2015-10-20  Alexey Proskuryakov  <ap@apple.com>
+
+        Mac Debug EWS never finishes when there are failures
+        https://bugs.webkit.org/show_bug.cgi?id=150334
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+
 2015-10-20  Philippe Normand  <pnormand@igalia.com>
 
         [GTK] Enable OpenWebRTC test video/audio sources in tests
index 25bc658..e34a836 100644 (file)
@@ -45,6 +45,7 @@ class AbstractEarlyWarningSystemTest(QueuesTest):
         # Needed to define port_name, used in AbstractEarlyWarningSystem.__init__
         class TestEWS(AbstractEarlyWarningSystem):
             port_name = "win"  # Needs to be a port which port/factory understands.
+            _build_style = None
 
         ews = TestEWS()
         ews.bind_to_tool(MockTool())
index 21955cb..edd48d9 100644 (file)
@@ -250,6 +250,9 @@ class AbstractPatchQueue(AbstractQueue):
     def work_item_log_path(self, patch):
         return os.path.join(self._log_directory(), "%s.log" % patch.bug_id())
 
+    def build_style(self):
+        return "release"
+
 
 # Used to share code between the EWS and commit-queue.
 class PatchProcessingQueue(AbstractPatchQueue):
@@ -269,6 +272,15 @@ class PatchProcessingQueue(AbstractPatchQueue):
             return 'win-future'
         return port_name
 
+    def _create_port(self):
+        self._port = self._tool.port_factory.get(self._new_port_name_from_old(self.port_name, self._tool.platform))
+        if self.architecture:
+            self._port.set_architecture(self.architecture)
+        if self.build_style() == "debug":
+            self._port.set_option("configuration", "Debug")
+        else:
+            self._port.set_option("configuration", "Release")
+
     def begin_work_queue(self):
         AbstractPatchQueue.begin_work_queue(self)
         if not self.port_name:
@@ -278,13 +290,11 @@ class PatchProcessingQueue(AbstractPatchQueue):
         # FIXME: This violates abstraction
         self._tool._deprecated_port = self._deprecated_port
 
-        self._port = self._tool.port_factory.get(self._new_port_name_from_old(self.port_name, self._tool.platform))
-        if self.architecture:
-            self._port.set_architecture(self.architecture)
+        self._create_port()
 
     def _upload_results_archive_for_patch(self, patch, results_archive_zip):
         if not self._port:
-            self._port = self._tool.port_factory.get(self._new_port_name_from_old(self.port_name, self._tool.platform))
+            self._create_port()
 
         bot_id = self._tool.status_server.bot_id or "bot"
         description = "Archive of layout-test-results from %s for %s" % (bot_id, self._port.name())
@@ -382,9 +392,6 @@ class CommitQueue(PatchProcessingQueue, StepSequenceErrorHandler, CommitQueueTas
     def archive_last_test_results(self, patch):
         return self._layout_test_results_reader.archive(patch)
 
-    def build_style(self):
-        return "release"
-
     def refetch_patch(self, patch):
         return self._tool.bugs.fetch_attachment(patch.id())