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 15 matching lines...) Expand all Loading... |
26 for file_name in existing + additional: | 26 for file_name in existing + additional: |
27 if file_name in combined: | 27 if file_name in combined: |
28 print 'WARNING: two references to file %s in the build.' % file_name | 28 print 'WARNING: two references to file %s in the build.' % file_name |
29 combined.add(file_name) | 29 combined.add(file_name) |
30 return sorted(combined) | 30 return sorted(combined) |
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 ppapi_scons_files['nonvariant_test_scons_files'] = [] |
36 | 37 |
37 ppapi_scons_files['nonvariant_test_scons_files'] = [ | 38 ppapi_scons_files['irt_variant_test_scons_files'] = [ |
38 'tests/breakpad_crash_test/nacl.scons', | 39 'tests/breakpad_crash_test/nacl.scons', |
39 'tests/nacl_browser/browser_dynamic_library/nacl.scons', | 40 'tests/nacl_browser/browser_dynamic_library/nacl.scons', |
| 41 # 'inbrowser_test_runner' must be in the irt_variant list |
| 42 # otherwise it will run no tests. |
| 43 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', |
| 44 # Disabled by Brad Chen 4 Sep to try to green Chromium |
| 45 # nacl_integration tests |
| 46 #'tests/nacl_browser/fault_injection/nacl.scons', |
40 'tests/nacl_browser/manifest_file/nacl.scons', | 47 'tests/nacl_browser/manifest_file/nacl.scons', |
41 'tests/nacl_browser/nameservice/nacl.scons', | 48 'tests/nacl_browser/nameservice/nacl.scons', |
| 49 'tests/nacl_browser/pnacl_client_translator/nacl.scons', |
42 'tests/nacl_browser/postmessage_redir/nacl.scons', | 50 'tests/nacl_browser/postmessage_redir/nacl.scons', |
43 'tests/ppapi_browser/bad/nacl.scons', | 51 'tests/ppapi_browser/bad/nacl.scons', |
44 'tests/ppapi_browser/crash/nacl.scons', | 52 'tests/ppapi_browser/crash/nacl.scons', |
45 'tests/ppapi_browser/extension_mime_handler/nacl.scons', | 53 'tests/ppapi_browser/extension_mime_handler/nacl.scons', |
46 'tests/ppapi_browser/manifest/nacl.scons', | 54 'tests/ppapi_browser/manifest/nacl.scons', |
47 'tests/ppapi_browser/ppb_instance/nacl.scons', | 55 'tests/ppapi_browser/ppb_instance/nacl.scons', |
48 'tests/ppapi_browser/ppp_instance/nacl.scons', | 56 'tests/ppapi_browser/ppp_instance/nacl.scons', |
49 'tests/ppapi_test_lib/nacl.scons', | 57 'tests/ppapi_test_lib/nacl.scons', |
50 ] | 58 ] |
51 | 59 |
52 ppapi_scons_files['irt_variant_test_scons_files'] = [ | |
53 # 'inbrowser_test_runner' must be in the irt_variant list | |
54 # otherwise it will run no tests. | |
55 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', | |
56 # Disabled by Brad Chen 4 Sep to try to green Chromium | |
57 # nacl_integration tests | |
58 #'tests/nacl_browser/fault_injection/nacl.scons', | |
59 'tests/nacl_browser/pnacl_client_translator/nacl.scons', | |
60 ] | |
61 | |
62 ppapi_scons_files['untrusted_scons_files'] = [ | 60 ppapi_scons_files['untrusted_scons_files'] = [ |
63 'src/shared/ppapi/nacl.scons', | 61 'src/shared/ppapi/nacl.scons', |
64 'src/untrusted/irt_stub/nacl.scons', | 62 'src/untrusted/irt_stub/nacl.scons', |
65 'src/untrusted/nacl_ppapi_util/nacl.scons', | 63 'src/untrusted/nacl_ppapi_util/nacl.scons', |
66 'src/untrusted/pnacl_irt_shim/nacl.scons', | 64 'src/untrusted/pnacl_irt_shim/nacl.scons', |
67 'src/untrusted/pnacl_support_extension/nacl.scons', | 65 'src/untrusted/pnacl_support_extension/nacl.scons', |
68 ] | 66 ] |
69 | 67 |
70 | 68 |
71 EXTRA_ENV = ['XAUTHORITY', 'HOME', 'DISPLAY', 'SSH_TTY', 'KRB5CCNAME'] | 69 EXTRA_ENV = ['XAUTHORITY', 'HOME', 'DISPLAY', 'SSH_TTY', 'KRB5CCNAME'] |
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
636 | 634 |
637 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) | 635 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) |
638 | 636 |
639 | 637 |
640 def AddChromeFilesFromGroup(env, file_group): | 638 def AddChromeFilesFromGroup(env, file_group): |
641 env['BUILD_SCONSCRIPTS'] = ExtendFileList( | 639 env['BUILD_SCONSCRIPTS'] = ExtendFileList( |
642 env.get('BUILD_SCONSCRIPTS', []), | 640 env.get('BUILD_SCONSCRIPTS', []), |
643 ppapi_scons_files[file_group]) | 641 ppapi_scons_files[file_group]) |
644 | 642 |
645 pre_base_env.AddMethod(AddChromeFilesFromGroup) | 643 pre_base_env.AddMethod(AddChromeFilesFromGroup) |
OLD | NEW |