Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 3 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
| 4 # for details. All rights reserved. Use of this source code is governed by a | 4 # for details. All rights reserved. Use of this source code is governed by a |
| 5 # BSD-style license that can be found in the LICENSE file. | 5 # BSD-style license that can be found in the LICENSE file. |
| 6 # | 6 # |
| 7 | 7 |
| 8 import optparse | 8 import optparse |
| 9 import os | 9 import os |
| 10 import shutil | 10 import shutil |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 309 % os.environ['ANDROID_TOOLCHAIN']) | 309 % os.environ['ANDROID_TOOLCHAIN']) |
| 310 toolsOverride = SetTools(arch, toolchainprefix) | 310 toolsOverride = SetTools(arch, toolchainprefix) |
| 311 if toolsOverride: | 311 if toolsOverride: |
| 312 printToolOverrides = target_os != 'android' | 312 printToolOverrides = target_os != 'android' |
| 313 for k, v in toolsOverride.iteritems(): | 313 for k, v in toolsOverride.iteritems(): |
| 314 args.append( k + "=" + v) | 314 args.append( k + "=" + v) |
| 315 if printToolOverrides: | 315 if printToolOverrides: |
| 316 print k + " = " + v | 316 print k + " = " + v |
| 317 | 317 |
| 318 print ' '.join(args) | 318 print ' '.join(args) |
| 319 process = subprocess.Popen(args) | 319 # We redirect stderr to sys.stdout bacause the buildbot is not |
| 320 # collecting stderr output. | |
| 321 process = subprocess.Popen(args, stderr=sys.stdout) | |
|
Mads Ager (google)
2012/10/23 08:34:15
Should this just be stderr=STDOUT?
ahe
2012/10/23 08:36:51
That would be stderr=subprocess.STDOUT but that do
Emily Fortuna
2012/10/23 16:46:17
Why does stderr=subprocess.STDOUT not work?
ahe
2012/10/29 12:59:39
I don't know. We tried and it didn't work. However
Emily Fortuna
2012/10/29 16:17:56
alternatively:
process = subprocess.Popen(args, st
ahe
2012/11/05 09:58:11
Unfortunately, that would be a severe regression c
| |
| 320 process.wait() | 322 process.wait() |
| 321 if process.returncode != 0: | 323 if process.returncode != 0: |
| 322 print "BUILD FAILED" | 324 print "BUILD FAILED" |
| 323 return 1 | 325 return 1 |
| 324 | 326 |
| 325 return 0 | 327 return 0 |
| 326 | 328 |
| 327 | 329 |
| 328 if __name__ == '__main__': | 330 if __name__ == '__main__': |
| 329 sys.exit(Main()) | 331 sys.exit(Main()) |
| OLD | NEW |