| 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 | 8 |
| 9 # This tests an interface that is specific to Mac OS X and/or Mach and | 9 # This tests an interface that is specific to Mac OS X and/or Mach and |
| 10 # that is only implemented for x86-32. | 10 # that is only implemented for x86-32. |
| 11 if not env.Bit('host_mac') or not env.Bit('build_x86_32'): | 11 if not env.Bit('host_mac') or not env.Bit('build_x86_32'): |
| 12 Return() | 12 Return() |
| 13 | 13 |
| 14 # These tests use nexes built by other tests. Nexes do not get staged in | 14 # These tests use nexes built by other tests. Nexes do not get staged in |
| 15 # pexe mode, so only run this test in nonpexe mode. | 15 # pexe mode, so only run this test in nonpexe mode. |
| 16 if env.Bit('pnacl_generate_pexe'): | 16 if env.Bit('pnacl_generate_pexe'): |
| 17 Return() | 17 Return() |
| 18 | 18 |
| 19 if 'TRUSTED_ENV' not in env: | 19 if 'TRUSTED_ENV' not in env: |
| 20 Return() | 20 Return() |
| 21 trusted_env = env['TRUSTED_ENV'] | 21 trusted_env = env['TRUSTED_ENV'] |
| 22 | 22 |
| 23 # This duplicates the library list in src/trusted/service_runtime/build.scons. | 23 # This duplicates the library list in src/trusted/service_runtime/build.scons. |
| 24 # We would not have to do this if we could get Scons to track dependencies | 24 # We would not have to do this if we could get Scons to track dependencies |
| 25 # between libraries. | 25 # between libraries. |
| 26 VALIDATOR_LIBS = [] | 26 VALIDATOR_LIBS = [] |
| 27 if trusted_env.Bit('target_x86'): | 27 if trusted_env.Bit('target_x86'): |
| 28 VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate')] | 28 VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate'), |
| 29 trusted_env.NaClTargetArchSuffix('dfa_validate_caller'), |
| 30 trusted_env.NaClTargetArchSuffix('dfa_validate'), |
| 31 ] |
| 29 elif trusted_env.Bit('target_arm'): | 32 elif trusted_env.Bit('target_arm'): |
| 30 VALIDATOR_LIBS += ['ncvalidate_arm_v2'] | 33 VALIDATOR_LIBS += ['ncvalidate_arm_v2'] |
| 31 | 34 |
| 32 runner = trusted_env.ComponentProgram( | 35 runner = trusted_env.ComponentProgram( |
| 33 'mach_crash_forwarding_test', ['mach_crash_forwarding_test.c'], | 36 'mach_crash_forwarding_test', ['mach_crash_forwarding_test.c'], |
| 34 EXTRA_LIBS=['sel', | 37 EXTRA_LIBS=['sel', |
| 35 'sel_debug_dummy', | 38 'sel_debug_dummy', |
| 36 'manifest_proxy', | 39 'manifest_proxy', |
| 37 'simple_service', | 40 'simple_service', |
| 38 'thread_interface', | 41 'thread_interface', |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 declares_exit_status=True) | 85 declares_exit_status=True) |
| 83 env.AddNodeToTestSuite(node, test_suites, | 86 env.AddNodeToTestSuite(node, test_suites, |
| 84 'run_mach_unforwarded_trusted_crash_test', | 87 'run_mach_unforwarded_trusted_crash_test', |
| 85 is_broken=is_broken) | 88 is_broken=is_broken) |
| 86 | 89 |
| 87 node = env.CommandTest('mach_forward_early_trusted_crash_test.out', | 90 node = env.CommandTest('mach_forward_early_trusted_crash_test.out', |
| 88 [runner, 'early_trusted'], declares_exit_status=True) | 91 [runner, 'early_trusted'], declares_exit_status=True) |
| 89 env.AddNodeToTestSuite(node, test_suites, | 92 env.AddNodeToTestSuite(node, test_suites, |
| 90 'run_mach_forward_early_trusted_crash_test', | 93 'run_mach_forward_early_trusted_crash_test', |
| 91 is_broken=is_broken) | 94 is_broken=is_broken) |
| OLD | NEW |