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

Side by Side Diff: native_client_sdk/src/build_tools/test_projects.py

Issue 19079002: Enable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: IOS flag name Created 7 years, 5 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 | « chrome/test/ppapi/ppapi_test.cc ('k') | native_client_sdk/src/tools/common.mk » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2013 The Chromium 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 optparse 6 import optparse
7 import os 7 import os
8 import subprocess 8 import subprocess
9 import sys 9 import sys
10 import time 10 import time
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 exe_dir = GetExecutableDirForProject(desc, toolchain, config) 95 exe_dir = GetExecutableDirForProject(desc, toolchain, config)
96 96
97 if toolchain == platform: 97 if toolchain == platform:
98 ppapi_plugin = os.path.join(exe_dir, desc['NAME']) 98 ppapi_plugin = os.path.join(exe_dir, desc['NAME'])
99 if platform == 'win': 99 if platform == 'win':
100 ppapi_plugin += '.dll' 100 ppapi_plugin += '.dll'
101 else: 101 else:
102 ppapi_plugin += '.so' 102 ppapi_plugin += '.so'
103 args.extend(['--ppapi_plugin', ppapi_plugin]) 103 args.extend(['--ppapi_plugin', ppapi_plugin])
104 104
105 if toolchain == 'pnacl':
106 args.extend(['--browser_flag', '--enable-pnacl'])
107
108 url = 'index.html' 105 url = 'index.html'
109 url += '?tc=%s&config=%s&test=true' % (toolchain, config) 106 url += '?tc=%s&config=%s&test=true' % (toolchain, config)
110 args.extend(['--url', url]) 107 args.extend(['--url', url])
111 return args 108 return args
112 109
113 110
114 def GetBrowserTesterEnv(): 111 def GetBrowserTesterEnv():
115 # browser_tester imports tools/valgrind/memcheck_analyze, which imports 112 # browser_tester imports tools/valgrind/memcheck_analyze, which imports
116 # tools/valgrind/common. Well, it tries to, anyway, but instead imports 113 # tools/valgrind/common. Well, it tries to, anyway, but instead imports
117 # common from PYTHONPATH first (which on the buildbots, is a 114 # common from PYTHONPATH first (which on the buildbots, is a
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 312
316 313
317 if __name__ == '__main__': 314 if __name__ == '__main__':
318 script_name = os.path.basename(sys.argv[0]) 315 script_name = os.path.basename(sys.argv[0])
319 try: 316 try:
320 sys.exit(main(sys.argv)) 317 sys.exit(main(sys.argv))
321 except parse_dsc.ValidationError as e: 318 except parse_dsc.ValidationError as e:
322 buildbot_common.ErrorExit('%s: %s' % (script_name, e)) 319 buildbot_common.ErrorExit('%s: %s' % (script_name, e))
323 except KeyboardInterrupt: 320 except KeyboardInterrupt:
324 buildbot_common.ErrorExit('%s: interrupted' % script_name) 321 buildbot_common.ErrorExit('%s: interrupted' % script_name)
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | native_client_sdk/src/tools/common.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698