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 26 matching lines...) Expand all Loading... |
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/ppapi_test_lib/nacl.scons', | 40 'tests/ppapi_test_lib/nacl.scons', |
41 ] | 41 ] |
42 | 42 |
43 ppapi_scons_files['irt_variant_test_scons_files'] = [ | 43 ppapi_scons_files['irt_variant_test_scons_files'] = [ |
44 # 'inbrowser_test_runner' must be in the irt_variant list | 44 # 'inbrowser_test_runner' must be in the irt_variant list |
45 # otherwise it will run no tests. | 45 # otherwise it will run no tests. |
46 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', | 46 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', |
47 # Disabled by Brad Chen 4 Sep to try to green Chromium | |
48 # nacl_integration tests | |
49 #'tests/nacl_browser/fault_injection/nacl.scons', | |
50 ] | 47 ] |
51 | 48 |
52 ppapi_scons_files['untrusted_scons_files'] = [ | 49 ppapi_scons_files['untrusted_scons_files'] = [ |
53 'src/shared/ppapi/nacl.scons', | 50 'src/shared/ppapi/nacl.scons', |
54 'src/untrusted/irt_stub/nacl.scons', | 51 'src/untrusted/irt_stub/nacl.scons', |
55 'src/untrusted/nacl_ppapi_util/nacl.scons', | 52 'src/untrusted/nacl_ppapi_util/nacl.scons', |
56 ] | 53 ] |
57 | 54 |
58 | 55 |
59 EXTRA_ENV = [ | 56 EXTRA_ENV = [ |
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
522 | 519 |
523 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) | 520 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) |
524 | 521 |
525 | 522 |
526 def AddChromeFilesFromGroup(env, file_group): | 523 def AddChromeFilesFromGroup(env, file_group): |
527 env['BUILD_SCONSCRIPTS'] = ExtendFileList( | 524 env['BUILD_SCONSCRIPTS'] = ExtendFileList( |
528 env.get('BUILD_SCONSCRIPTS', []), | 525 env.get('BUILD_SCONSCRIPTS', []), |
529 ppapi_scons_files[file_group]) | 526 ppapi_scons_files[file_group]) |
530 | 527 |
531 pre_base_env.AddMethod(AddChromeFilesFromGroup) | 528 pre_base_env.AddMethod(AddChromeFilesFromGroup) |
OLD | NEW |