| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 # Copyright (c) 2012 Google Inc. All rights reserved. | 2 # Copyright (c) 2012 Google Inc. 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 | 6 | 
| 7 """Argument-less script to select what to run on the buildbots.""" | 7 """Argument-less script to select what to run on the buildbots.""" | 
| 8 | 8 | 
| 9 | 9 | 
| 10 import filecmp | 10 import filecmp | 
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 172   """ | 172   """ | 
| 173   if not format: | 173   if not format: | 
| 174     format = title | 174     format = title | 
| 175 | 175 | 
| 176   print '@@@BUILD_STEP ' + title + '@@@' | 176   print '@@@BUILD_STEP ' + title + '@@@' | 
| 177   sys.stdout.flush() | 177   sys.stdout.flush() | 
| 178   env = os.environ.copy() | 178   env = os.environ.copy() | 
| 179   if msvs_version: | 179   if msvs_version: | 
| 180     env['GYP_MSVS_VERSION'] = msvs_version | 180     env['GYP_MSVS_VERSION'] = msvs_version | 
| 181   command = ' '.join( | 181   command = ' '.join( | 
| 182       [sys.executable, 'trunk/gyptest.py', | 182       [sys.executable, 'gyp/gyptest.py', | 
| 183        '--all', | 183        '--all', | 
| 184        '--passed', | 184        '--passed', | 
| 185        '--format', format, | 185        '--format', format, | 
| 186        '--path', CMAKE_BIN_DIR, | 186        '--path', CMAKE_BIN_DIR, | 
| 187        '--chdir', 'trunk'] + tests) | 187        '--chdir', 'gyp'] + tests) | 
| 188   if format == 'android': | 188   if format == 'android': | 
| 189     # gyptest needs the environment setup from envsetup/lunch in order to build | 189     # gyptest needs the environment setup from envsetup/lunch in order to build | 
| 190     # using the 'android' backend, so this is done in a single shell. | 190     # using the 'android' backend, so this is done in a single shell. | 
| 191     retcode = subprocess.call( | 191     retcode = subprocess.call( | 
| 192         ['/bin/bash', | 192         ['/bin/bash', | 
| 193          '-c', '%s && cd %s && %s' % (_ANDROID_SETUP, ROOT_DIR, command)], | 193          '-c', '%s && cd %s && %s' % (_ANDROID_SETUP, ROOT_DIR, command)], | 
| 194         cwd=ANDROID_DIR, env=env) | 194         cwd=ANDROID_DIR, env=env) | 
| 195   else: | 195   else: | 
| 196     retcode = subprocess.call(command, cwd=ROOT_DIR, env=env, shell=True) | 196     retcode = subprocess.call(command, cwd=ROOT_DIR, env=env, shell=True) | 
| 197   if retcode: | 197   if retcode: | 
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 242     # TODO(bradnelson): once the annotator supports a postscript (section for | 242     # TODO(bradnelson): once the annotator supports a postscript (section for | 
| 243     #     after the build proper that could be used for cumulative failures), | 243     #     after the build proper that could be used for cumulative failures), | 
| 244     #     use that instead of this. This isolates the final return value so | 244     #     use that instead of this. This isolates the final return value so | 
| 245     #     that it isn't misattributed to the last stage. | 245     #     that it isn't misattributed to the last stage. | 
| 246     print '@@@BUILD_STEP failures@@@' | 246     print '@@@BUILD_STEP failures@@@' | 
| 247     sys.exit(retcode) | 247     sys.exit(retcode) | 
| 248 | 248 | 
| 249 | 249 | 
| 250 if __name__ == '__main__': | 250 if __name__ == '__main__': | 
| 251   GypBuild() | 251   GypBuild() | 
| OLD | NEW | 
|---|