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 20 matching lines...) Expand all Loading... |
31 | 31 |
32 | 32 |
33 ppapi_scons_files = {} | 33 ppapi_scons_files = {} |
34 ppapi_scons_files['trusted_scons_files'] = [] | 34 ppapi_scons_files['trusted_scons_files'] = [] |
35 ppapi_scons_files['untrusted_irt_scons_files'] = [] | 35 ppapi_scons_files['untrusted_irt_scons_files'] = [] |
36 | 36 |
37 ppapi_scons_files['nonvariant_test_scons_files'] = [ | 37 ppapi_scons_files['nonvariant_test_scons_files'] = [ |
38 'tests/breakpad_crash_test/nacl.scons', | 38 'tests/breakpad_crash_test/nacl.scons', |
39 'tests/nacl_browser/browser_dynamic_library/nacl.scons', | 39 'tests/nacl_browser/browser_dynamic_library/nacl.scons', |
40 'tests/nacl_browser/manifest_file/nacl.scons', | 40 'tests/nacl_browser/manifest_file/nacl.scons', |
41 'tests/nacl_browser/nameservice/nacl.scons', | |
42 'tests/ppapi_browser/extension_mime_handler/nacl.scons', | 41 'tests/ppapi_browser/extension_mime_handler/nacl.scons', |
43 'tests/ppapi_browser/manifest/nacl.scons', | 42 'tests/ppapi_browser/manifest/nacl.scons', |
44 'tests/ppapi_test_lib/nacl.scons', | 43 'tests/ppapi_test_lib/nacl.scons', |
45 ] | 44 ] |
46 | 45 |
47 ppapi_scons_files['irt_variant_test_scons_files'] = [ | 46 ppapi_scons_files['irt_variant_test_scons_files'] = [ |
48 # 'inbrowser_test_runner' must be in the irt_variant list | 47 # 'inbrowser_test_runner' must be in the irt_variant list |
49 # otherwise it will run no tests. | 48 # otherwise it will run no tests. |
50 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', | 49 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', |
51 # Disabled by Brad Chen 4 Sep to try to green Chromium | 50 # Disabled by Brad Chen 4 Sep to try to green Chromium |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 | 558 |
560 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) | 559 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) |
561 | 560 |
562 | 561 |
563 def AddChromeFilesFromGroup(env, file_group): | 562 def AddChromeFilesFromGroup(env, file_group): |
564 env['BUILD_SCONSCRIPTS'] = ExtendFileList( | 563 env['BUILD_SCONSCRIPTS'] = ExtendFileList( |
565 env.get('BUILD_SCONSCRIPTS', []), | 564 env.get('BUILD_SCONSCRIPTS', []), |
566 ppapi_scons_files[file_group]) | 565 ppapi_scons_files[file_group]) |
567 | 566 |
568 pre_base_env.AddMethod(AddChromeFilesFromGroup) | 567 pre_base_env.AddMethod(AddChromeFilesFromGroup) |
OLD | NEW |