| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 82 |
| 83 | 83 |
| 84 def GetBrowserTesterCommand(desc, toolchain, config): | 84 def GetBrowserTesterCommand(desc, toolchain, config): |
| 85 args = [ | 85 args = [ |
| 86 sys.executable, | 86 sys.executable, |
| 87 browser_tester_py, | 87 browser_tester_py, |
| 88 '--browser_path', browser_path, | 88 '--browser_path', browser_path, |
| 89 '--timeout', '30.0', # seconds | 89 '--timeout', '30.0', # seconds |
| 90 # Prevent the infobar that shows up when requesting filesystem quota. | 90 # Prevent the infobar that shows up when requesting filesystem quota. |
| 91 '--browser_flag', '--unlimited-storage', | 91 '--browser_flag', '--unlimited-storage', |
| 92 # Some samples need the use the socket API. Enabling this for all | |
| 93 # tests should be harmless. | |
| 94 '--browser_flag', '--allow-nacl-socket-api=localhost', | |
| 95 ] | 92 ] |
| 96 | 93 |
| 97 args.extend(['--serving_dir', GetServingDirForProject(desc)]) | 94 args.extend(['--serving_dir', GetServingDirForProject(desc)]) |
| 98 exe_dir = GetExecutableDirForProject(desc, toolchain, config) | 95 exe_dir = GetExecutableDirForProject(desc, toolchain, config) |
| 99 | 96 |
| 100 if toolchain == platform: | 97 if toolchain == platform: |
| 101 ppapi_plugin = os.path.join(exe_dir, desc['NAME']) | 98 ppapi_plugin = os.path.join(exe_dir, desc['NAME']) |
| 102 if platform == 'win': | 99 if platform == 'win': |
| 103 ppapi_plugin += '.dll' | 100 ppapi_plugin += '.dll' |
| 104 else: | 101 else: |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 | 320 |
| 324 | 321 |
| 325 if __name__ == '__main__': | 322 if __name__ == '__main__': |
| 326 script_name = os.path.basename(sys.argv[0]) | 323 script_name = os.path.basename(sys.argv[0]) |
| 327 try: | 324 try: |
| 328 sys.exit(main(sys.argv)) | 325 sys.exit(main(sys.argv)) |
| 329 except parse_dsc.ValidationError as e: | 326 except parse_dsc.ValidationError as e: |
| 330 buildbot_common.ErrorExit('%s: %s' % (script_name, e)) | 327 buildbot_common.ErrorExit('%s: %s' % (script_name, e)) |
| 331 except KeyboardInterrupt: | 328 except KeyboardInterrupt: |
| 332 buildbot_common.ErrorExit('%s: interrupted' % script_name) | 329 buildbot_common.ErrorExit('%s: interrupted' % script_name) |
| OLD | NEW |