| 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 VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate_verbose')] | 17 VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate_verbose')] |
| 18 elif trusted_env.Bit('target_arm'): | 18 elif trusted_env.Bit('target_arm'): |
| 19 VALIDATOR_LIBS += ['ncvalidate_arm_v2'] | 19 VALIDATOR_LIBS += ['ncvalidate_arm_v2'] |
| 20 | 20 |
| 21 DEBUG_LIBS = ['debug_stub_init', 'gdb_rsp', 'debug_stub'] | 21 DEBUG_LIBS = ['debug_stub_init', 'gdb_rsp', 'debug_stub'] |
| 22 | 22 |
| 23 if trusted_env.Bit('linux'): |
| 24 trusted_env.Append(LIBS=['dl']) |
| 25 |
| 23 runner = trusted_env.ComponentProgram( | 26 runner = trusted_env.ComponentProgram( |
| 24 'multidomain_test_host', ['multidomain_test_host.c'], | 27 'multidomain_test_host', ['multidomain_test_host.c'], |
| 25 EXTRA_LIBS=['sel', | 28 EXTRA_LIBS=['sel', |
| 26 'manifest_proxy', | 29 'manifest_proxy', |
| 27 'simple_service', | 30 'simple_service', |
| 28 'thread_interface', | 31 'thread_interface', |
| 29 'gio_wrapped_desc', | 32 'gio_wrapped_desc', |
| 30 'nonnacl_srpc', | 33 'nonnacl_srpc', |
| 31 'nrd_xfer', | 34 'nrd_xfer', |
| 32 'nacl_perf_counter', | 35 'nacl_perf_counter', |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 # * We disable this on x86-32 because it needs 2GB of address space | 70 # * We disable this on x86-32 because it needs 2GB of address space |
| 68 # and that might not be available given the vagaries of ASLR. | 71 # and that might not be available given the vagaries of ASLR. |
| 69 is_broken = (env.Bit('build_arm') | 72 is_broken = (env.Bit('build_arm') |
| 70 or env.Bit('build_x86_32') | 73 or env.Bit('build_x86_32') |
| 71 or env.Bit('host_mac') | 74 or env.Bit('host_mac') |
| 72 or env.Bit('host_windows') | 75 or env.Bit('host_windows') |
| 73 or env.Bit('nacl_glibc')) | 76 or env.Bit('nacl_glibc')) |
| 74 | 77 |
| 75 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test', | 78 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test', |
| 76 is_broken=is_broken) | 79 is_broken=is_broken) |
| OLD | NEW |