Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Side by Side Diff: ppapi/native_client/chrome_main.scons

Issue 11145002: Remove more tests from the NaCl SCons build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad test Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ppapi/native_client/ppapi_scons_files.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 22 matching lines...) Expand all
33 combined = set() 33 combined = set()
34 for file_name in existing + additional: 34 for file_name in existing + additional:
35 if file_name in combined: 35 if file_name in combined:
36 print 'WARNING: two references to file %s in the build.' % file_name 36 print 'WARNING: two references to file %s in the build.' % file_name
37 combined.add(file_name) 37 combined.add(file_name)
38 return sorted(combined) 38 return sorted(combined)
39 39
40 ppapi_scons_files['nonvariant_test_scons_files'] = ExtendFileList( 40 ppapi_scons_files['nonvariant_test_scons_files'] = ExtendFileList(
41 ppapi_scons_files.get('nonvariant_test_scons_files', []), [ 41 ppapi_scons_files.get('nonvariant_test_scons_files', []), [
42 'tests/nacl_browser/browser_dynamic_library/nacl.scons', 42 'tests/nacl_browser/browser_dynamic_library/nacl.scons',
43 'tests/nacl_browser/browser_startup_time/nacl.scons',
44 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', 43 'tests/nacl_browser/inbrowser_test_runner/nacl.scons',
45 'tests/nacl_browser/manifest_file/nacl.scons', 44 'tests/nacl_browser/manifest_file/nacl.scons',
46 'tests/nacl_browser/nameservice/nacl.scons', 45 'tests/nacl_browser/nameservice/nacl.scons',
47 'tests/nacl_browser/postmessage_redir/nacl.scons', 46 'tests/nacl_browser/postmessage_redir/nacl.scons',
48 ]) 47 ])
49 48
50 ppapi_scons_files['irt_variant_test_scons_files'] = ExtendFileList( 49 ppapi_scons_files['irt_variant_test_scons_files'] = ExtendFileList(
51 ppapi_scons_files.get('irt_variant_test_scons_files', []), [ 50 ppapi_scons_files.get('irt_variant_test_scons_files', []), [
52 # Disabled by Brad Chen 4 Sep to try to green Chromium 51 # Disabled by Brad Chen 4 Sep to try to green Chromium
53 # nacl_integration tests 52 # nacl_integration tests
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 629
631 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) 630 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken)
632 631
633 632
634 def AddChromeFilesFromGroup(env, file_group): 633 def AddChromeFilesFromGroup(env, file_group):
635 env['BUILD_SCONSCRIPTS'] = ExtendFileList( 634 env['BUILD_SCONSCRIPTS'] = ExtendFileList(
636 env.get('BUILD_SCONSCRIPTS', []), 635 env.get('BUILD_SCONSCRIPTS', []),
637 ppapi_scons_files[file_group]) 636 ppapi_scons_files[file_group])
638 637
639 pre_base_env.AddMethod(AddChromeFilesFromGroup) 638 pre_base_env.AddMethod(AddChromeFilesFromGroup)
OLDNEW
« no previous file with comments | « no previous file | ppapi/native_client/ppapi_scons_files.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698