Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2013 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 import optparse | 6 import optparse |
| 7 import os | 7 import os |
| 8 import subprocess | 8 import subprocess |
| 9 import sys | 9 import sys |
| 10 import time | 10 import time |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 exe_dir = GetExecutableDirForProject(desc, toolchain, config) | 98 exe_dir = GetExecutableDirForProject(desc, toolchain, config) |
| 99 | 99 |
| 100 if toolchain == platform: | 100 if toolchain == platform: |
| 101 ppapi_plugin = os.path.join(exe_dir, desc['NAME']) | 101 ppapi_plugin = os.path.join(exe_dir, desc['NAME']) |
| 102 if platform == 'win': | 102 if platform == 'win': |
| 103 ppapi_plugin += '.dll' | 103 ppapi_plugin += '.dll' |
| 104 else: | 104 else: |
| 105 ppapi_plugin += '.so' | 105 ppapi_plugin += '.so' |
| 106 args.extend(['--ppapi_plugin', ppapi_plugin]) | 106 args.extend(['--ppapi_plugin', ppapi_plugin]) |
| 107 | 107 |
| 108 if toolchain == 'pnacl': | |
|
binji
2013/08/12 17:59:35
I don't think this should be removed, should it?
sehr
2013/08/12 18:43:14
Oops. Thanks.
| |
| 109 args.extend(['--browser_flag', '--enable-pnacl']) | |
| 110 | |
| 111 url = 'index.html' | 108 url = 'index.html' |
| 112 url += '?tc=%s&config=%s&test=true' % (toolchain, config) | 109 url += '?tc=%s&config=%s&test=true' % (toolchain, config) |
| 113 args.extend(['--url', url]) | 110 args.extend(['--url', url]) |
| 114 return args | 111 return args |
| 115 | 112 |
| 116 | 113 |
| 117 def GetBrowserTesterEnv(): | 114 def GetBrowserTesterEnv(): |
| 118 # browser_tester imports tools/valgrind/memcheck_analyze, which imports | 115 # browser_tester imports tools/valgrind/memcheck_analyze, which imports |
| 119 # tools/valgrind/common. Well, it tries to, anyway, but instead imports | 116 # tools/valgrind/common. Well, it tries to, anyway, but instead imports |
| 120 # common from PYTHONPATH first (which on the buildbots, is a | 117 # common from PYTHONPATH first (which on the buildbots, is a |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 318 | 315 |
| 319 | 316 |
| 320 if __name__ == '__main__': | 317 if __name__ == '__main__': |
| 321 script_name = os.path.basename(sys.argv[0]) | 318 script_name = os.path.basename(sys.argv[0]) |
| 322 try: | 319 try: |
| 323 sys.exit(main(sys.argv)) | 320 sys.exit(main(sys.argv)) |
| 324 except parse_dsc.ValidationError as e: | 321 except parse_dsc.ValidationError as e: |
| 325 buildbot_common.ErrorExit('%s: %s' % (script_name, e)) | 322 buildbot_common.ErrorExit('%s: %s' % (script_name, e)) |
| 326 except KeyboardInterrupt: | 323 except KeyboardInterrupt: |
| 327 buildbot_common.ErrorExit('%s: interrupted' % script_name) | 324 buildbot_common.ErrorExit('%s: interrupted' % script_name) |
| OLD | NEW |