| 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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 456 command = env.GetHeadlessPrefix() + [ | 456 command = env.GetHeadlessPrefix() + [ |
| 457 '${PYTHON}', python_tester_script, | 457 '${PYTHON}', python_tester_script, |
| 458 '--browser_path', env.ChromeBinary(), | 458 '--browser_path', env.ChromeBinary(), |
| 459 '--url', url, | 459 '--url', url, |
| 460 # Fail if there is no response for X seconds. | 460 # Fail if there is no response for X seconds. |
| 461 '--timeout', str(timeout)] | 461 '--timeout', str(timeout)] |
| 462 for dep_file in files: | 462 for dep_file in files: |
| 463 command.extend(['--file', dep_file]) | 463 command.extend(['--file', dep_file]) |
| 464 for extension in extensions: | 464 for extension in extensions: |
| 465 command.extend(['--extension', extension]) | 465 command.extend(['--extension', extension]) |
| 466 if env.Bit('bitcode'): |
| 467 # Enable the installed version of pnacl, and point to a custom install |
| 468 # directory for testing purposes. |
| 469 browser_flags.append('--enable-pnacl') |
| 466 for dest_path, dep_file in map_files: | 470 for dest_path, dep_file in map_files: |
| 467 command.extend(['--map_file', dest_path, dep_file]) | 471 command.extend(['--map_file', dest_path, dep_file]) |
| 468 for file_ext, mime_type in mime_types: | 472 for file_ext, mime_type in mime_types: |
| 469 command.extend(['--mime_type', file_ext, mime_type]) | 473 command.extend(['--mime_type', file_ext, mime_type]) |
| 470 command.extend(['--serving_dir', '${NACL_SDK_LIB}']) | 474 command.extend(['--serving_dir', '${NACL_SDK_LIB}']) |
| 471 command.extend(['--serving_dir', '${LIB_DIR}']) | 475 command.extend(['--serving_dir', '${LIB_DIR}']) |
| 472 if 'browser_tester_bw' in ARGUMENTS: | 476 if 'browser_tester_bw' in ARGUMENTS: |
| 473 command.extend(['-b', ARGUMENTS['browser_tester_bw']]) | 477 command.extend(['-b', ARGUMENTS['browser_tester_bw']]) |
| 474 if not nmfs is None: | 478 if not nmfs is None: |
| 475 for nmf_file in nmfs: | 479 for nmf_file in nmfs: |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 | 568 |
| 565 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) | 569 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) |
| 566 | 570 |
| 567 | 571 |
| 568 def AddChromeFilesFromGroup(env, file_group): | 572 def AddChromeFilesFromGroup(env, file_group): |
| 569 env['BUILD_SCONSCRIPTS'] = ExtendFileList( | 573 env['BUILD_SCONSCRIPTS'] = ExtendFileList( |
| 570 env.get('BUILD_SCONSCRIPTS', []), | 574 env.get('BUILD_SCONSCRIPTS', []), |
| 571 ppapi_scons_files[file_group]) | 575 ppapi_scons_files[file_group]) |
| 572 | 576 |
| 573 pre_base_env.AddMethod(AddChromeFilesFromGroup) | 577 pre_base_env.AddMethod(AddChromeFilesFromGroup) |
| OLD | NEW |