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

Side by Side Diff: tests/startup_message/nacl.scons

Issue 7242011: Get rid of assumptions about ".nexe" extension. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 6 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 | « tests/stack_alignment/nacl.scons ('k') | tests/stubout_mode/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) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 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 os 6 import os
7 7
8 Import('env') 8 Import('env')
9 9
10 # This tests a feature that is currently only in nacl-glibc's dynamic 10 # This tests a feature that is currently only in nacl-glibc's dynamic
(...skipping 13 matching lines...) Expand all
24 if env.Bit('build_x86_32'): 24 if env.Bit('build_x86_32'):
25 Return() 25 Return()
26 26
27 if 'TRUSTED_ENV' not in env: 27 if 'TRUSTED_ENV' not in env:
28 Return() 28 Return()
29 trusted_env = env['TRUSTED_ENV'] 29 trusted_env = env['TRUSTED_ENV']
30 30
31 python_extension = trusted_env.File('${STAGING_DIR}/naclimc.so') 31 python_extension = trusted_env.File('${STAGING_DIR}/naclimc.so')
32 32
33 sel_ldr = trusted_env.File('${STAGING_DIR}/${PROGPREFIX}sel_ldr${PROGSUFFIX}') 33 sel_ldr = trusted_env.File('${STAGING_DIR}/${PROGPREFIX}sel_ldr${PROGSUFFIX}')
34 hello_world = env.File('${STAGING_DIR}/hello_world.nexe') 34 hello_world = env.File('${STAGING_DIR}/hello_world${PROGSUFFIX}')
35 env_vars = [ 35 env_vars = [
36 'PYTHONPATH=%s' % ':'.join([os.path.dirname(python_extension.abspath), 36 'PYTHONPATH=%s' % ':'.join([os.path.dirname(python_extension.abspath),
37 '${SCONSTRUCT_DIR}/src/tools/posix_over_imc']), 37 '${SCONSTRUCT_DIR}/src/tools/posix_over_imc']),
38 'NACL_SEL_LDR=%s' % sel_ldr, 38 'NACL_SEL_LDR=%s' % sel_ldr,
39 'HELLO_WORLD_PROG=%s' % hello_world, 39 'HELLO_WORLD_PROG=%s' % hello_world,
40 'NACL_LIBRARY_DIR=${NACL_SDK_LIB}', 40 'NACL_LIBRARY_DIR=${NACL_SDK_LIB}',
41 ] 41 ]
42 dependencies = [python_extension, sel_ldr, hello_world] 42 dependencies = [python_extension, sel_ldr, hello_world]
43 43
44 node = env.CommandTest( 44 node = env.CommandTest(
45 'startup_message_test.out', 45 'startup_message_test.out',
46 command=['${PYTHON}', env.File('test_startup.py')], 46 command=['${PYTHON}', env.File('test_startup.py')],
47 osenv=env_vars, 47 osenv=env_vars,
48 extra_deps=dependencies) 48 extra_deps=dependencies)
49 env.AddNodeToTestSuite(node, ['small_tests'], 'run_startup_message_test') 49 env.AddNodeToTestSuite(node, ['small_tests'], 'run_startup_message_test')
OLDNEW
« no previous file with comments | « tests/stack_alignment/nacl.scons ('k') | tests/stubout_mode/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698