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 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 Loading... |
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 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1508 env['TRUSTED_ENV'].Bit('windows')): | 1511 env['TRUSTED_ENV'].Bit('windows')): |
1509 return [] | 1512 return [] |
1510 | 1513 |
1511 # The nexe might be a pexe that needs finalization, and translation. | 1514 # The nexe might be a pexe that needs finalization, and translation. |
1512 nexe = env.GetTranslatedNexe(nexe) | 1515 nexe = env.GetTranslatedNexe(nexe) |
1513 | 1516 |
1514 command = [nexe] | 1517 command = [nexe] |
1515 if args is not None: | 1518 if args is not None: |
1516 command += args | 1519 command += args |
1517 | 1520 |
| 1521 if env.Bit('pnacl_unsandboxed'): |
| 1522 # Run unsandboxed executable directly, without sel_ldr. |
| 1523 return env.CommandTest(name, command, size, **extra) |
| 1524 |
1518 if loader is None: | 1525 if loader is None: |
1519 loader = env.GetSelLdr() | 1526 loader = env.GetSelLdr() |
1520 if loader is None: | 1527 if loader is None: |
1521 print 'WARNING: no sel_ldr found. Skipping test %s' % name | 1528 print 'WARNING: no sel_ldr found. Skipping test %s' % name |
1522 return [] | 1529 return [] |
1523 | 1530 |
1524 # Avoid problems with [] as default arguments | 1531 # Avoid problems with [] as default arguments |
1525 if sel_ldr_flags is None: | 1532 if sel_ldr_flags is None: |
1526 sel_ldr_flags = [] | 1533 sel_ldr_flags = [] |
1527 else: | 1534 else: |
(...skipping 2165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3693 nacl_env.ValidateSdk() | 3700 nacl_env.ValidateSdk() |
3694 | 3701 |
3695 if BROKEN_TEST_COUNT > 0: | 3702 if BROKEN_TEST_COUNT > 0: |
3696 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 3703 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
3697 if GetOption('brief_comstr'): | 3704 if GetOption('brief_comstr'): |
3698 msg += " Add --verbose to the command line for more information." | 3705 msg += " Add --verbose to the command line for more information." |
3699 print msg | 3706 print msg |
3700 | 3707 |
3701 # separate warnings from actual build output | 3708 # separate warnings from actual build output |
3702 Banner('B U I L D - O U T P U T:') | 3709 Banner('B U I L D - O U T P U T:') |
OLD | NEW |