| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Entry point for the AddIn build bot. | 6 """Entry point for the AddIn build bot. |
| 7 | 7 |
| 8 Perform build steps and output results using the buildbot | 8 Perform build steps and output results using the buildbot |
| 9 annootator syntax | 9 annootator syntax |
| 10 """ | 10 """ |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 if not os.path.exists(chrome): | 122 if not os.path.exists(chrome): |
| 123 Log('CHROME_PATH not found') | 123 Log('CHROME_PATH not found') |
| 124 Log('chrome not found in the default location: %s' % chrome) | 124 Log('chrome not found in the default location: %s' % chrome) |
| 125 Log('@@@STEP_FAILURE@@@') | 125 Log('@@@STEP_FAILURE@@@') |
| 126 sys.exit(1) | 126 sys.exit(1) |
| 127 env['CHROME_PATH'] = chrome | 127 env['CHROME_PATH'] = chrome |
| 128 for version in SDK_VERSIONS: | 128 for version in SDK_VERSIONS: |
| 129 Log('@@@BUILD_STEP test against %s@@@' % version) | 129 Log('@@@BUILD_STEP test against %s@@@' % version) |
| 130 env['NACL_SDK_ROOT'] = os.path.join(sdkroot, version) | 130 env['NACL_SDK_ROOT'] = os.path.join(sdkroot, version) |
| 131 RunCommand('test.bat', env) | 131 RunCommand('test.bat', env) |
| 132 RunCommand('test_2012.bat', env) |
| 132 | 133 |
| 133 | 134 |
| 134 def _FindInPath(filename): | 135 def _FindInPath(filename): |
| 135 for path in os.environ['PATH'].split(os.pathsep): | 136 for path in os.environ['PATH'].split(os.pathsep): |
| 136 result = os.path.join(path, filename) | 137 result = os.path.join(path, filename) |
| 137 if os.path.exists(result): | 138 if os.path.exists(result): |
| 138 return result | 139 return result |
| 139 | 140 |
| 140 Log('%s not found in PATH' % filename) | 141 Log('%s not found in PATH' % filename) |
| 141 Log('@@@STEP_FAILURE@@@') | 142 Log('@@@STEP_FAILURE@@@') |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 def main(): | 184 def main(): |
| 184 StepBuild() | 185 StepBuild() |
| 185 StepInstall() | 186 StepInstall() |
| 186 StepInstallSDK() | 187 StepInstallSDK() |
| 187 StepTest() | 188 StepTest() |
| 188 StepArchive() | 189 StepArchive() |
| 189 | 190 |
| 190 | 191 |
| 191 if __name__ == '__main__': | 192 if __name__ == '__main__': |
| 192 main() | 193 main() |
| OLD | NEW |