OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # Copyright 2011 The Native Client Authors. All rights reserved. | 2 # Copyright 2011 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 = [] | 15 VALIDATOR_LIBS = [] |
16 if trusted_env.Bit('target_x86'): | 16 if trusted_env.Bit('target_x86'): |
17 if trusted_env.Bit('target_x86_64'): | 17 if trusted_env.Bit('target_x86_64'): |
18 VALIDATOR_LIBS += ['ncvalidate_x86_64', 'ncvalidate_sfi'] | 18 VALIDATOR_LIBS += ['ncvalidate_x86_64', 'ncvalidate_sfi'] |
19 else: | 19 else: |
20 VALIDATOR_LIBS += ['ncvalidate_x86_32'] | 20 VALIDATOR_LIBS += ['ncvalidate_x86_32'] |
21 VALIDATOR_LIBS += ['ncvalidate'] | 21 VALIDATOR_LIBS += ['ncvalidate'] |
22 elif trusted_env.Bit('target_arm'): | 22 elif trusted_env.Bit('target_arm'): |
23 VALIDATOR_LIBS += ['ncvalidate_arm_v2', 'arm_validator_core'] | 23 VALIDATOR_LIBS += ['ncvalidate_arm_v2', 'arm_validator_core'] |
24 | 24 |
25 DEBUG_LIBS = ['debug_stub_init', 'gdb_rsp', 'debug_stub'] | 25 DEBUG_LIBS = ['debug_stub_init', 'gdb_rsp', 'debug_stub'] |
26 | 26 |
27 runner = trusted_env.ComponentProgram( | 27 runner = trusted_env.ComponentProgram( |
28 'multidomain_test_host', ['multidomain_test_host.c'], | 28 'multidomain_test_host', ['multidomain_test_host.c'], |
29 EXTRA_LIBS=['sel', | 29 EXTRA_LIBS=['sel', |
| 30 'manifest_proxy', |
30 'simple_service', | 31 'simple_service', |
31 'thread_interface', | 32 'thread_interface', |
32 'gio_wrapped_desc', | 33 'gio_wrapped_desc', |
33 'nonnacl_srpc', | 34 'nonnacl_srpc', |
34 'nrd_xfer', | 35 'nrd_xfer', |
35 'nacl_perf_counter', | 36 'nacl_perf_counter', |
36 'nacl_base', | 37 'nacl_base', |
37 'imc', | 38 'imc', |
38 'container', | 39 'container', |
39 'platform', | 40 'platform', |
(...skipping 21 matching lines...) Expand all Loading... |
61 # executable. Furthermore, statically-linked nacl-glibc does not | 62 # executable. Furthermore, statically-linked nacl-glibc does not |
62 # work here because of validation failures which require stubout | 63 # work here because of validation failures which require stubout |
63 # mode. | 64 # mode. |
64 is_broken = (env.Bit('build_arm') | 65 is_broken = (env.Bit('build_arm') |
65 or env.Bit('host_mac') | 66 or env.Bit('host_mac') |
66 or env.Bit('host_windows') | 67 or env.Bit('host_windows') |
67 or env.Bit('nacl_glibc')) | 68 or env.Bit('nacl_glibc')) |
68 | 69 |
69 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test', | 70 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test', |
70 is_broken=is_broken) | 71 is_broken=is_broken) |
OLD | NEW |