| 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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 'chrome-mac-beta': 'mac-beta', | 575 'chrome-mac-beta': 'mac-beta', |
| 576 'chrome-mac-stable': 'mac-stable', | 576 'chrome-mac-stable': 'mac-stable', |
| 577 'chrome-win-beta': 'win-beta', | 577 'chrome-win-beta': 'win-beta', |
| 578 'chrome-win-stable': 'win-stable', | 578 'chrome-win-stable': 'win-stable', |
| 579 'chromium-linux-targets': 'linux-targets', | 579 'chromium-linux-targets': 'linux-targets', |
| 580 'chromium-mac-targets': 'mac-targets', | 580 'chromium-mac-targets': 'mac-targets', |
| 581 'chromium-rel-linux': 'linux-release', | 581 'chromium-rel-linux': 'linux-release', |
| 582 'chromium-rel-linux-64': 'linux-release-64', | 582 'chromium-rel-linux-64': 'linux-release-64', |
| 583 'chromium-rel-linux-hardy': 'linux-release-hardy', | 583 'chromium-rel-linux-hardy': 'linux-release-hardy', |
| 584 'chromium-rel-linux-hardy-lowmem': 'linux-release-lowmem', | 584 'chromium-rel-linux-hardy-lowmem': 'linux-release-lowmem', |
| 585 'chromium-rel-linux-memory': 'linux-release-memory', |
| 585 'chromium-rel-linux-webkit': 'linux-release-webkit-latest', | 586 'chromium-rel-linux-webkit': 'linux-release-webkit-latest', |
| 586 'chromium-rel-mac': 'mac-release', | 587 'chromium-rel-mac': 'mac-release', |
| 588 'chromium-rel-mac-memory': 'mac-release-memory', |
| 587 'chromium-rel-mac5': 'mac-release-10.5', | 589 'chromium-rel-mac5': 'mac-release-10.5', |
| 588 'chromium-rel-mac6': 'mac-release-10.6', | 590 'chromium-rel-mac6': 'mac-release-10.6', |
| 589 'chromium-rel-mac5-v8': 'mac-release-10.5-v8-latest', | 591 'chromium-rel-mac5-v8': 'mac-release-10.5-v8-latest', |
| 590 'chromium-rel-mac6-v8': 'mac-release-10.6-v8-latest', | 592 'chromium-rel-mac6-v8': 'mac-release-10.6-v8-latest', |
| 591 'chromium-rel-mac6-webkit': 'mac-release-10.6-webkit-latest', | 593 'chromium-rel-mac6-webkit': 'mac-release-10.6-webkit-latest', |
| 592 'chromium-rel-old-mac6': 'mac-release-old-10.6', | 594 'chromium-rel-old-mac6': 'mac-release-old-10.6', |
| 593 'chromium-rel-vista-dual': 'vista-release-dual-core', | 595 'chromium-rel-vista-dual': 'vista-release-dual-core', |
| 594 'chromium-rel-vista-dual-v8': 'vista-release-v8-latest', | 596 'chromium-rel-vista-dual-v8': 'vista-release-v8-latest', |
| 597 'chromium-rel-vista-memory': 'vista-release-memory', |
| 595 'chromium-rel-vista-single': 'vista-release-single-core', | 598 'chromium-rel-vista-single': 'vista-release-single-core', |
| 596 'chromium-rel-vista-webkit': 'vista-release-webkit-latest', | 599 'chromium-rel-vista-webkit': 'vista-release-webkit-latest', |
| 597 'chromium-rel-xp': 'xp-release', | 600 'chromium-rel-xp': 'xp-release', |
| 598 'chromium-rel-xp-dual': 'xp-release-dual-core', | 601 'chromium-rel-xp-dual': 'xp-release-dual-core', |
| 599 'chromium-rel-xp-single': 'xp-release-single-core', | 602 'chromium-rel-xp-single': 'xp-release-single-core', |
| 600 'chromium-win-targets': 'win-targets', | 603 'chromium-win-targets': 'win-targets', |
| 601 'nacl-lucid64-spec-x86': 'nacl-lucid64-spec-x86', | 604 'nacl-lucid64-spec-x86': 'nacl-lucid64-spec-x86', |
| 602 'nacl-lucid64-spec-arm': 'nacl-lucid64-spec-arm', | 605 'nacl-lucid64-spec-arm': 'nacl-lucid64-spec-arm', |
| 603 'nacl-lucid64-spec-trans': 'nacl-lucid64-spec-trans', | 606 'nacl-lucid64-spec-trans': 'nacl-lucid64-spec-trans', |
| 604 }, | 607 }, |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 def evaluateCommand(self, cmd): | 1104 def evaluateCommand(self, cmd): |
| 1102 observer_result = self.script_observer.annotate_status | 1105 observer_result = self.script_observer.annotate_status |
| 1103 # Check if ProcessLogShellStep detected a failure or warning also. | 1106 # Check if ProcessLogShellStep detected a failure or warning also. |
| 1104 log_processor_result = ProcessLogShellStep.evaluateCommand(self, cmd) | 1107 log_processor_result = ProcessLogShellStep.evaluateCommand(self, cmd) |
| 1105 return BuilderStatus.combine(observer_result, log_processor_result) | 1108 return BuilderStatus.combine(observer_result, log_processor_result) |
| 1106 | 1109 |
| 1107 def commandComplete(self, cmd): | 1110 def commandComplete(self, cmd): |
| 1108 self.script_observer.handleReturnCode(cmd.rc) | 1111 self.script_observer.handleReturnCode(cmd.rc) |
| 1109 self._removePreamble() | 1112 self._removePreamble() |
| 1110 return ProcessLogShellStep.commandComplete(self, cmd) | 1113 return ProcessLogShellStep.commandComplete(self, cmd) |
| OLD | NEW |