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

Side by Side Diff: SConstruct

Issue 10834447: Scons: Drop the uses_ppapi argument from CommandSelLdrTestNacl() (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: add nonirt_libs Created 8 years, 4 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 | tests/manifest_file/nacl.scons » ('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 subprocess 9 import subprocess
10 import sys 10 import sys
(...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 1439
1440 1440
1441 def CommandSelLdrTestNacl(env, name, nexe, 1441 def CommandSelLdrTestNacl(env, name, nexe,
1442 args = None, 1442 args = None,
1443 log_verbosity=2, 1443 log_verbosity=2,
1444 sel_ldr_flags=None, 1444 sel_ldr_flags=None,
1445 loader=None, 1445 loader=None,
1446 size='medium', 1446 size='medium',
1447 # True for *.nexe statically linked with glibc 1447 # True for *.nexe statically linked with glibc
1448 glibc_static=False, 1448 glibc_static=False,
1449 uses_ppapi=False,
1450 skip_bootstrap=False, 1449 skip_bootstrap=False,
1451 wrapper_program_prefix=None, 1450 wrapper_program_prefix=None,
1452 # e.g., [ 'python', 'time_check.py', '--' ] 1451 # e.g., [ 'python', 'time_check.py', '--' ]
1453 **extra): 1452 **extra):
1454 # Disable all sel_ldr tests for windows under coverage. 1453 # Disable all sel_ldr tests for windows under coverage.
1455 # Currently several .S files block sel_ldr from being instrumented. 1454 # Currently several .S files block sel_ldr from being instrumented.
1456 # See http://code.google.com/p/nativeclient/issues/detail?id=831 1455 # See http://code.google.com/p/nativeclient/issues/detail?id=831
1457 if ('TRUSTED_ENV' in env and 1456 if ('TRUSTED_ENV' in env and
1458 env['TRUSTED_ENV'].Bit('coverage_enabled') and 1457 env['TRUSTED_ENV'].Bit('coverage_enabled') and
1459 env['TRUSTED_ENV'].Bit('windows')): 1458 env['TRUSTED_ENV'].Bit('windows')):
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 # line for those cases. 1499 # line for those cases.
1501 if env.Bit('nacl_glibc') and env['NACL_BUILD_FAMILY'] != 'TRUSTED': 1500 if env.Bit('nacl_glibc') and env['NACL_BUILD_FAMILY'] != 'TRUSTED':
1502 if not glibc_static and not env.Bit('nacl_static_link'): 1501 if not glibc_static and not env.Bit('nacl_static_link'):
1503 command = ['${NACL_SDK_LIB}/runnable-ld.so', 1502 command = ['${NACL_SDK_LIB}/runnable-ld.so',
1504 # Locally-built shared libraries come from ${LIB_DIR} 1503 # Locally-built shared libraries come from ${LIB_DIR}
1505 # while toolchain-provided ones come from ${NACL_SDK_LIB}. 1504 # while toolchain-provided ones come from ${NACL_SDK_LIB}.
1506 '--library-path', '${LIB_DIR}:${NACL_SDK_LIB}'] + command 1505 '--library-path', '${LIB_DIR}:${NACL_SDK_LIB}'] + command
1507 # Enable file access. 1506 # Enable file access.
1508 sel_ldr_flags += ['-a'] 1507 sel_ldr_flags += ['-a']
1509 1508
1510 if env.Bit('tests_use_irt') or uses_ppapi: 1509 if env.Bit('tests_use_irt'):
1511 sel_ldr_flags += ['-B', nacl_env.GetIrtNexe(chrome_irt=uses_ppapi)] 1510 sel_ldr_flags += ['-B', nacl_env.GetIrtNexe()]
1512 1511
1513 if skip_bootstrap: 1512 if skip_bootstrap:
1514 loader_cmd = [loader] 1513 loader_cmd = [loader]
1515 else: 1514 else:
1516 loader_cmd = env.AddBootstrap(loader, []) 1515 loader_cmd = env.AddBootstrap(loader, [])
1517 1516
1518 command = loader_cmd + sel_ldr_flags + ['--'] + command 1517 command = loader_cmd + sel_ldr_flags + ['--'] + command
1519 1518
1520 if env.ShouldUseVerboseOptions(extra): 1519 if env.ShouldUseVerboseOptions(extra):
1521 env.MakeVerboseExtraOptions(name, log_verbosity, extra) 1520 env.MakeVerboseExtraOptions(name, log_verbosity, extra)
(...skipping 1813 matching lines...) Expand 10 before | Expand all | Expand 10 after
3335 nacl_env.ValidateSdk() 3334 nacl_env.ValidateSdk()
3336 3335
3337 if BROKEN_TEST_COUNT > 0: 3336 if BROKEN_TEST_COUNT > 0:
3338 msg = "There are %d broken tests." % BROKEN_TEST_COUNT 3337 msg = "There are %d broken tests." % BROKEN_TEST_COUNT
3339 if GetOption('brief_comstr'): 3338 if GetOption('brief_comstr'):
3340 msg += " Add --verbose to the command line for more information." 3339 msg += " Add --verbose to the command line for more information."
3341 print msg 3340 print msg
3342 3341
3343 # separate warnings from actual build output 3342 # separate warnings from actual build output
3344 Banner('B U I L D - O U T P U T:') 3343 Banner('B U I L D - O U T P U T:')
OLDNEW
« no previous file with comments | « no previous file | tests/manifest_file/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698