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

Side by Side Diff: SConstruct

Issue 26607002: PNaCl: Allow translator to produce an unsandboxed, native executable (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Expand on comment Created 7 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 | buildbot/buildbot_pnacl.sh » ('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 atexit 6 import atexit
7 import os 7 import os
8 import platform 8 import platform
9 import re 9 import re
10 import subprocess 10 import subprocess
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 BitFromArgument(env, 'use_sandboxed_translator', default=False, 301 BitFromArgument(env, 'use_sandboxed_translator', default=False,
302 desc='use pnacl sandboxed translator for linking (not available for arm)') 302 desc='use pnacl sandboxed translator for linking (not available for arm)')
303 303
304 BitFromArgument(env, 'pnacl_generate_pexe', default=env.Bit('bitcode'), 304 BitFromArgument(env, 'pnacl_generate_pexe', default=env.Bit('bitcode'),
305 desc='use pnacl to generate pexes and translate in a separate step') 305 desc='use pnacl to generate pexes and translate in a separate step')
306 306
307 BitFromArgument(env, 'translate_in_build_step', default=True, 307 BitFromArgument(env, 'translate_in_build_step', default=True,
308 desc='Run translation during build phase (e.g. if do_not_run_tests=1)') 308 desc='Run translation during build phase (e.g. if do_not_run_tests=1)')
309 309
310 BitFromArgument(env, 'pnacl_unsandboxed', default=False,
311 desc='Translate pexe to an unsandboxed, host executable')
312
310 BitFromArgument(env, 'browser_headless', default=False, 313 BitFromArgument(env, 'browser_headless', default=False,
311 desc='Where possible, set up a dummy display to run the browser on ' 314 desc='Where possible, set up a dummy display to run the browser on '
312 'when running browser tests. On Linux, this runs the browser through ' 315 'when running browser tests. On Linux, this runs the browser through '
313 'xvfb-run. This Scons does not need to be run with an X11 display ' 316 'xvfb-run. This Scons does not need to be run with an X11 display '
314 'and we do not open a browser window on the user\'s desktop. ' 317 'and we do not open a browser window on the user\'s desktop. '
315 'Unfortunately there is no equivalent on Mac OS X.') 318 'Unfortunately there is no equivalent on Mac OS X.')
316 319
317 BitFromArgument(env, 'disable_crash_dialog', default=True, 320 BitFromArgument(env, 'disable_crash_dialog', default=True,
318 desc='Disable Windows\' crash dialog box, which Windows pops up when a ' 321 desc='Disable Windows\' crash dialog box, which Windows pops up when a '
319 'process exits with an unhandled fault. Windows enables this by ' 322 'process exits with an unhandled fault. Windows enables this by '
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1511 env['TRUSTED_ENV'].Bit('windows')): 1514 env['TRUSTED_ENV'].Bit('windows')):
1512 return [] 1515 return []
1513 1516
1514 # The nexe might be a pexe that needs finalization, and translation. 1517 # The nexe might be a pexe that needs finalization, and translation.
1515 nexe = env.GetTranslatedNexe(nexe) 1518 nexe = env.GetTranslatedNexe(nexe)
1516 1519
1517 command = [nexe] 1520 command = [nexe]
1518 if args is not None: 1521 if args is not None:
1519 command += args 1522 command += args
1520 1523
1524 if env.Bit('pnacl_unsandboxed'):
1525 # Run unsandboxed executable directly, without sel_ldr.
1526 return env.CommandTest(name, command, size, **extra)
1527
1521 if loader is None: 1528 if loader is None:
1522 loader = env.GetSelLdr() 1529 loader = env.GetSelLdr()
1523 if loader is None: 1530 if loader is None:
1524 print 'WARNING: no sel_ldr found. Skipping test %s' % name 1531 print 'WARNING: no sel_ldr found. Skipping test %s' % name
1525 return [] 1532 return []
1526 1533
1527 # Avoid problems with [] as default arguments 1534 # Avoid problems with [] as default arguments
1528 if sel_ldr_flags is None: 1535 if sel_ldr_flags is None:
1529 sel_ldr_flags = [] 1536 sel_ldr_flags = []
1530 else: 1537 else:
(...skipping 2165 matching lines...) Expand 10 before | Expand all | Expand 10 after
3696 nacl_env.ValidateSdk() 3703 nacl_env.ValidateSdk()
3697 3704
3698 if BROKEN_TEST_COUNT > 0: 3705 if BROKEN_TEST_COUNT > 0:
3699 msg = "There are %d broken tests." % BROKEN_TEST_COUNT 3706 msg = "There are %d broken tests." % BROKEN_TEST_COUNT
3700 if GetOption('brief_comstr'): 3707 if GetOption('brief_comstr'):
3701 msg += " Add --verbose to the command line for more information." 3708 msg += " Add --verbose to the command line for more information."
3702 print msg 3709 print msg
3703 3710
3704 # separate warnings from actual build output 3711 # separate warnings from actual build output
3705 Banner('B U I L D - O U T P U T:') 3712 Banner('B U I L D - O U T P U T:')
OLDNEW
« no previous file with comments | « no previous file | buildbot/buildbot_pnacl.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698