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

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

Issue 10158002: Scons: Remove duplication of VALIDATOR_LIBS list and use library_deps.py instead (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Copyright Created 8 years, 8 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 | « src/trusted/service_runtime/build.scons ('k') | tests/minnacl/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 2012 The Native Client Authors. All rights reserved. 2 # Copyright 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can 3 # Use of this source code is governed by a BSD-style license that can
4 # be found in the LICENSE file. 4 # be found in the LICENSE file.
5 5
6 Import('env') 6 Import('env')
7 7
8 if 'TRUSTED_ENV' not in env: 8 if 'TRUSTED_ENV' not in env:
9 Return() 9 Return()
10 trusted_env = env['TRUSTED_ENV'] 10 trusted_env = env['TRUSTED_ENV']
11 11
12 # This duplicates the library list in src/trusted/service_runtime/build.scons. 12 # This duplicates the library list in src/trusted/service_runtime/build.scons.
13 # We would not have to do this if we could get Scons to track dependencies 13 # We would not have to do this if we could get Scons to track dependencies
14 # between libraries. 14 # between libraries.
15 VALIDATOR_LIBS = []
16 if trusted_env.Bit('target_x86'):
17 VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate')]
18 elif trusted_env.Bit('target_arm'):
19 VALIDATOR_LIBS += ['ncvalidate_arm_v2']
20
21 test_host = trusted_env.ComponentProgram( 15 test_host = trusted_env.ComponentProgram(
22 'desc_test_host', ['desc_test_host.c'], 16 'desc_test_host', ['desc_test_host.c'],
23 EXTRA_LIBS=['sel', 17 EXTRA_LIBS=['sel',
24 'nacl_interval', 18 'nacl_interval',
25 'sel_debug_dummy', 19 'sel_debug_dummy',
26 'manifest_proxy', 20 'manifest_proxy',
27 'simple_service', 21 'simple_service',
28 'thread_interface', 22 'thread_interface',
29 'gio_wrapped_desc', 23 'gio_wrapped_desc',
30 'nonnacl_srpc', 24 'nonnacl_srpc',
31 'nrd_xfer', 25 'nrd_xfer',
32 'nacl_perf_counter', 26 'nacl_perf_counter',
33 'nacl_base', 27 'nacl_base',
34 'imc', 28 'imc',
35 'container', 29 'container',
36 'nacl_fault_inject', 30 'nacl_fault_inject',
37 'platform', 31 'platform',
38 'platform_qual_lib', 32 'platform_qual_lib',
39 'gio', 33 'gio',
40 ] + VALIDATOR_LIBS) 34 ])
41 35
42 test_guest = env.ComponentProgram( 36 test_guest = env.ComponentProgram(
43 'desc_test_guest', ['desc_test_guest.c'], 37 'desc_test_guest', ['desc_test_guest.c'],
44 EXTRA_LIBS=['imc_syscalls', '${NONIRT_LIBS}']) 38 EXTRA_LIBS=['imc_syscalls', '${NONIRT_LIBS}'])
45 39
46 if env.Bit('pnacl_generate_pexe'): 40 if env.Bit('pnacl_generate_pexe'):
47 test_guest = env.GetTranslatedNexe(test_guest) 41 test_guest = env.GetTranslatedNexe(test_guest)
48 42
49 test_command = [test_host, test_guest] 43 test_command = [test_host, test_guest]
50 bootstrap, _ = env.GetBootstrap() 44 bootstrap, _ = env.GetBootstrap()
51 if bootstrap is not None: 45 if bootstrap is not None:
52 test_command = [bootstrap] + test_command 46 test_command = [bootstrap] + test_command
53 47
54 node = env.CommandTest('custom_desc_test.out', test_command) 48 node = env.CommandTest('custom_desc_test.out', test_command)
55 env.AddNodeToTestSuite(node, ['small_tests'], 'run_custom_desc_test', 49 env.AddNodeToTestSuite(node, ['small_tests'], 'run_custom_desc_test',
56 is_broken=not env.Bit('nacl_static_link')) 50 is_broken=not env.Bit('nacl_static_link'))
OLDNEW
« no previous file with comments | « src/trusted/service_runtime/build.scons ('k') | tests/minnacl/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698