OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """Subclasses of various slave command classes.""" | 5 """Subclasses of various slave command classes.""" |
6 | 6 |
7 import copy | 7 import copy |
8 import errno | 8 import errno |
9 import json | 9 import json |
10 import logging | 10 import logging |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 return None | 95 return None |
96 # Change revision numbers can be invalid, for a try job for instance. | 96 # Change revision numbers can be invalid, for a try job for instance. |
97 # TODO(maruel): Make this work for git hash. | 97 # TODO(maruel): Make this work for git hash. |
98 lastChange = max([change_to_revision(c) for c in changes]) | 98 lastChange = max([change_to_revision(c) for c in changes]) |
99 return lastChange | 99 return lastChange |
100 | 100 |
101 def startVC(self, branch, revision, patch): | 101 def startVC(self, branch, revision, patch): |
102 warnings = [] | 102 warnings = [] |
103 args = copy.copy(self.args) | 103 args = copy.copy(self.args) |
104 wk_revision = revision | 104 wk_revision = revision |
| 105 if patch: |
| 106 match = re.search(r'third_party/WebKit@(\w+)', patch[1]) |
| 107 if match: |
| 108 wk_revision = match.group(1) |
105 try: | 109 try: |
106 # parent_wk_revision might be set, but empty. | 110 # parent_wk_revision might be set, but empty. |
107 if self.getProperty('parent_wk_revision'): | 111 if self.getProperty('parent_wk_revision'): |
108 wk_revision = self.getProperty('parent_wk_revision') | 112 wk_revision = self.getProperty('parent_wk_revision') |
109 except KeyError: | 113 except KeyError: |
110 pass | 114 pass |
111 nacl_revision = revision | 115 nacl_revision = revision |
112 try: | 116 try: |
113 # parent_nacl_revision might be set, but empty. | 117 # parent_nacl_revision might be set, but empty. |
114 if self.getProperty('parent_got_nacl_revision'): | 118 if self.getProperty('parent_got_nacl_revision'): |
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1065 def evaluateCommand(self, cmd): | 1069 def evaluateCommand(self, cmd): |
1066 observer_result = self.script_observer.annotate_status | 1070 observer_result = self.script_observer.annotate_status |
1067 # Check if ProcessLogShellStep detected a failure or warning also. | 1071 # Check if ProcessLogShellStep detected a failure or warning also. |
1068 log_processor_result = ProcessLogShellStep.evaluateCommand(self, cmd) | 1072 log_processor_result = ProcessLogShellStep.evaluateCommand(self, cmd) |
1069 return BuilderStatus.combine(observer_result, log_processor_result) | 1073 return BuilderStatus.combine(observer_result, log_processor_result) |
1070 | 1074 |
1071 def commandComplete(self, cmd): | 1075 def commandComplete(self, cmd): |
1072 self.script_observer.handleReturnCode(cmd.rc) | 1076 self.script_observer.handleReturnCode(cmd.rc) |
1073 self._removePreamble() | 1077 self._removePreamble() |
1074 return ProcessLogShellStep.commandComplete(self, cmd) | 1078 return ProcessLogShellStep.commandComplete(self, cmd) |
OLD | NEW |