| OLD | NEW |
| 1 #! -*- python -*- | 1 #! -*- python -*- |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client 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 json | 6 import json |
| 7 import os | 7 import os |
| 8 import shutil | 8 import shutil |
| 9 import sys | 9 import sys |
| 10 | 10 |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 514 command = env.GetHeadlessPrefix() + [ | 514 command = env.GetHeadlessPrefix() + [ |
| 515 '${PYTHON}', python_tester_script, | 515 '${PYTHON}', python_tester_script, |
| 516 '--browser_path', env.ChromeBinary(), | 516 '--browser_path', env.ChromeBinary(), |
| 517 '--url', url, | 517 '--url', url, |
| 518 # Fail if there is no response for X seconds. | 518 # Fail if there is no response for X seconds. |
| 519 '--timeout', str(timeout)] | 519 '--timeout', str(timeout)] |
| 520 for dep_file in files: | 520 for dep_file in files: |
| 521 command.extend(['--file', dep_file]) | 521 command.extend(['--file', dep_file]) |
| 522 for extension in extensions: | 522 for extension in extensions: |
| 523 command.extend(['--extension', extension]) | 523 command.extend(['--extension', extension]) |
| 524 if env.Bit('bitcode'): | |
| 525 # Enable the installed version of pnacl, and point to a custom install | |
| 526 # directory for testing purposes. | |
| 527 browser_flags.append('--enable-pnacl') | |
| 528 for dest_path, dep_file in map_files: | 524 for dest_path, dep_file in map_files: |
| 529 command.extend(['--map_file', dest_path, dep_file]) | 525 command.extend(['--map_file', dest_path, dep_file]) |
| 530 for file_ext, mime_type in mime_types: | 526 for file_ext, mime_type in mime_types: |
| 531 command.extend(['--mime_type', file_ext, mime_type]) | 527 command.extend(['--mime_type', file_ext, mime_type]) |
| 532 command.extend(['--serving_dir', '${NACL_SDK_LIB}']) | 528 command.extend(['--serving_dir', '${NACL_SDK_LIB}']) |
| 533 command.extend(['--serving_dir', '${LIB_DIR}']) | 529 command.extend(['--serving_dir', '${LIB_DIR}']) |
| 534 if 'browser_tester_bw' in ARGUMENTS: | 530 if 'browser_tester_bw' in ARGUMENTS: |
| 535 command.extend(['-b', ARGUMENTS['browser_tester_bw']]) | 531 command.extend(['-b', ARGUMENTS['browser_tester_bw']]) |
| 536 if not nmfs is None: | 532 if not nmfs is None: |
| 537 for nmf_file in nmfs: | 533 for nmf_file in nmfs: |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 | 625 |
| 630 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) | 626 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) |
| 631 | 627 |
| 632 | 628 |
| 633 def AddChromeFilesFromGroup(env, file_group): | 629 def AddChromeFilesFromGroup(env, file_group): |
| 634 env['BUILD_SCONSCRIPTS'] = ExtendFileList( | 630 env['BUILD_SCONSCRIPTS'] = ExtendFileList( |
| 635 env.get('BUILD_SCONSCRIPTS', []), | 631 env.get('BUILD_SCONSCRIPTS', []), |
| 636 ppapi_scons_files[file_group]) | 632 ppapi_scons_files[file_group]) |
| 637 | 633 |
| 638 pre_base_env.AddMethod(AddChromeFilesFromGroup) | 634 pre_base_env.AddMethod(AddChromeFilesFromGroup) |
| OLD | NEW |