Chromium Code Reviews| 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 """Set of utilities to add commands to a buildbot factory (BuildFactory). | 5 """Set of utilities to add commands to a buildbot factory (BuildFactory). |
| 6 | 6 |
| 7 All the utility functions to add steps to a build factory here are not | 7 All the utility functions to add steps to a build factory here are not |
| 8 project-specific. See the other *_commands.py for project-specific commands. | 8 project-specific. See the other *_commands.py for project-specific commands. |
| 9 """ | 9 """ |
| 10 | 10 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 'chromium-rel-old-mac6': 'mac-release-old-10.6', | 119 'chromium-rel-old-mac6': 'mac-release-old-10.6', |
| 120 'chromium-rel-vista-dual': 'vista-release-dual-core', | 120 'chromium-rel-vista-dual': 'vista-release-dual-core', |
| 121 'chromium-rel-vista-dual-v8': 'vista-release-v8-latest', | 121 'chromium-rel-vista-dual-v8': 'vista-release-v8-latest', |
| 122 'chromium-rel-vista-memory': 'vista-release-memory', | 122 'chromium-rel-vista-memory': 'vista-release-memory', |
| 123 'chromium-rel-vista-single': 'vista-release-single-core', | 123 'chromium-rel-vista-single': 'vista-release-single-core', |
| 124 'chromium-rel-vista-webkit': 'vista-release-webkit-latest', | 124 'chromium-rel-vista-webkit': 'vista-release-webkit-latest', |
| 125 'chromium-rel-xp': 'xp-release', | 125 'chromium-rel-xp': 'xp-release', |
| 126 'chromium-rel-xp-dual': 'xp-release-dual-core', | 126 'chromium-rel-xp-dual': 'xp-release-dual-core', |
| 127 'chromium-rel-xp-single': 'xp-release-single-core', | 127 'chromium-rel-xp-single': 'xp-release-single-core', |
| 128 'chromium-win-targets': 'win-targets', | 128 'chromium-win-targets': 'win-targets', |
| 129 'gpu-win7-release-nvidia': 'gpu-win7-release-nvidia', | |
| 130 'gpu-mac-release-intel': 'gpu-mac-release-intel', | |
| 131 'gpu-linux-release-nvidia': 'gpu-linux-release-nvidia', | |
| 132 'gpu-webkit-win7-nvidia': 'gpu-webkit-win7-nvidia', | |
| 133 'gpu-webkit-mac': 'gpu-webkit-mac', | |
| 134 'gpu-webkit-linux-nvidia': 'gpu-webkit-linux-nvidia', | |
|
cmp
2012/04/03 19:12:32
lines 129-134 should not be necessary and we're tr
Zhenyao Mo
2012/04/03 19:51:11
Done.
| |
| 129 'gpu-fyi-linux-release-ati': 'gpu-fyi-linux-release-ati', | 135 'gpu-fyi-linux-release-ati': 'gpu-fyi-linux-release-ati', |
| 130 'gpu-fyi-linux-release-intel': 'gpu-fyi-linux-release-intel', | 136 'gpu-fyi-linux-release-intel': 'gpu-fyi-linux-release-intel', |
| 131 'gpu-fyi-mac-release-ati': 'gpu-fyi-mac-release-ati', | 137 'gpu-fyi-mac-release-ati': 'gpu-fyi-mac-release-ati', |
| 132 'gpu-fyi-win7-release-ati': 'gpu-fyi-win7-release-ati', | 138 'gpu-fyi-win7-release-ati': 'gpu-fyi-win7-release-ati', |
| 133 'gpu-fyi-win7-release-intel': 'gpu-fyi-win7-release-intel', | 139 'gpu-fyi-win7-release-intel': 'gpu-fyi-win7-release-intel', |
| 134 'gpu-fyi-winxp-release-nvidia': 'gpu-fyi-winxp-release-nvidia', | 140 'gpu-fyi-winxp-release-nvidia': 'gpu-fyi-winxp-release-nvidia', |
| 135 'o3d-mac-experimental': 'o3d-mac-experimental', | 141 'o3d-mac-experimental': 'o3d-mac-experimental', |
| 136 'o3d-win-experimental': 'o3d-win-experimental', | 142 'o3d-win-experimental': 'o3d-win-experimental', |
| 137 'nacl-lucid64-spec-x86': 'nacl-lucid64-spec-x86', | 143 'nacl-lucid64-spec-x86': 'nacl-lucid64-spec-x86', |
| 138 'nacl-lucid64-spec-arm': 'nacl-lucid64-spec-arm', | 144 'nacl-lucid64-spec-arm': 'nacl-lucid64-spec-arm', |
| (...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 881 | 887 |
| 882 def commandComplete(self, cmd): | 888 def commandComplete(self, cmd): |
| 883 out = cmd.logs['stdio'].getText() | 889 out = cmd.logs['stdio'].getText() |
| 884 build_properties = re.findall('BUILD_PROPERTY ([^=]*)=(.*)', out) | 890 build_properties = re.findall('BUILD_PROPERTY ([^=]*)=(.*)', out) |
| 885 for propname, value in build_properties: | 891 for propname, value in build_properties: |
| 886 # findall can return strings containing CR characters, remove with strip. | 892 # findall can return strings containing CR characters, remove with strip. |
| 887 self.build.setProperty(propname, value.strip(), 'Step') | 893 self.build.setProperty(propname, value.strip(), 'Step') |
| 888 | 894 |
| 889 def getText(self, cmd, results): | 895 def getText(self, cmd, results): |
| 890 return self.describe(True) + self.messages | 896 return self.describe(True) + self.messages |
| OLD | NEW |