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

Side by Side Diff: tests/multiple_sandboxes/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 | « tests/minnacl/nacl.scons ('k') | tests/trusted_crash/osx_crash_filter/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 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('env') 6 Import('env')
7 7
8 # This test case tests an experimental use case for NaCl. If you make 8 # This test case tests an experimental use case for NaCl. If you make
9 # a change which breaks this test which is difficult to fix, you can 9 # a change which breaks this test which is difficult to fix, you can
10 # disable the test, but please CC mseaborn,krasin. 10 # disable the test, but please CC mseaborn,krasin.
11 11
12 if 'TRUSTED_ENV' not in env: 12 if 'TRUSTED_ENV' not in env:
13 Return() 13 Return()
14 trusted_env = env['TRUSTED_ENV'] 14 trusted_env = env['TRUSTED_ENV']
15 15
16 # This duplicates the library list in src/trusted/service_runtime/build.scons. 16 # This duplicates the library list in src/trusted/service_runtime/build.scons.
17 # We would not have to do this if we could get Scons to track dependencies 17 # We would not have to do this if we could get Scons to track dependencies
18 # between libraries. 18 # between libraries.
19 VALIDATOR_LIBS = []
20 if trusted_env.Bit('target_x86'):
21 VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate_verbose')]
22 elif trusted_env.Bit('target_arm'):
23 VALIDATOR_LIBS += ['ncvalidate_arm_v2']
24
25 runner = trusted_env.ComponentProgram( 19 runner = trusted_env.ComponentProgram(
26 'multidomain_test_host', ['multidomain_test_host.c'], 20 'multidomain_test_host', ['multidomain_test_host.c'],
27 EXTRA_LIBS=['sel', 21 EXTRA_LIBS=['sel',
28 'sel_debug_dummy', 22 'sel_debug_dummy',
29 'manifest_proxy', 23 'manifest_proxy',
30 'simple_service', 24 'simple_service',
31 'thread_interface', 25 'thread_interface',
32 'gio_wrapped_desc', 26 'gio_wrapped_desc',
33 'nonnacl_srpc', 27 'nonnacl_srpc',
34 'nrd_xfer', 28 'nrd_xfer',
35 'nacl_perf_counter', 29 'nacl_perf_counter',
36 'nacl_base', 30 'nacl_base',
37 'imc', 31 'imc',
38 'container', 32 'container',
39 'nacl_fault_inject', 33 'nacl_fault_inject',
40 'nacl_interval', 34 'nacl_interval',
41 'platform', 35 'platform',
42 'platform_qual_lib', 36 'platform_qual_lib',
43 'gio', 37 'gio',
44 ] + VALIDATOR_LIBS) 38 ])
45 39
46 test_prog = env.ComponentProgram( 40 test_prog = env.ComponentProgram(
47 'multidomain_test_guest', ['multidomain_test_guest.c'], 41 'multidomain_test_guest', ['multidomain_test_guest.c'],
48 EXTRA_LIBS=['imc_syscalls', '${NONIRT_LIBS}']) 42 EXTRA_LIBS=['imc_syscalls', '${NONIRT_LIBS}'])
49 43
50 # If we are generating a pexe, translate it first 44 # If we are generating a pexe, translate it first
51 if env.Bit('pnacl_generate_pexe'): 45 if env.Bit('pnacl_generate_pexe'):
52 test_prog = env.GetTranslatedNexe(test_prog) 46 test_prog = env.GetTranslatedNexe(test_prog)
53 47
54 node = env.CommandTest('multidomain_test.out', [runner, test_prog], 48 node = env.CommandTest('multidomain_test.out', [runner, test_prog],
(...skipping 10 matching lines...) Expand all
65 # * multidomain_test_host assumes it is given a statically linked 59 # * multidomain_test_host assumes it is given a statically linked
66 # executable. Furthermore, statically-linked nacl-glibc does not 60 # executable. Furthermore, statically-linked nacl-glibc does not
67 # work here because of validation failures which require stubout 61 # work here because of validation failures which require stubout
68 # mode. 62 # mode.
69 is_broken = (env.Bit('build_arm') 63 is_broken = (env.Bit('build_arm')
70 or env.Bit('host_mac') 64 or env.Bit('host_mac')
71 or env.Bit('nacl_glibc')) 65 or env.Bit('nacl_glibc'))
72 66
73 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test', 67 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test',
74 is_broken=is_broken) 68 is_broken=is_broken)
OLDNEW
« no previous file with comments | « tests/minnacl/nacl.scons ('k') | tests/trusted_crash/osx_crash_filter/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698