| OLD | NEW |
| 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 | 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. |
| 10 # that is only implemented for x86-32. | 10 if not env.Bit('host_mac'): |
| 11 if not env.Bit('host_mac') or not env.Bit('build_x86_32'): | |
| 12 Return() | 11 Return() |
| 13 | 12 |
| 14 # These tests use nexes built by other tests. Nexes do not get staged in | 13 # 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. | 14 # pexe mode, so only run this test in nonpexe mode. |
| 16 if env.Bit('pnacl_generate_pexe'): | 15 if env.Bit('pnacl_generate_pexe'): |
| 17 Return() | 16 Return() |
| 18 | 17 |
| 19 if 'TRUSTED_ENV' not in env: | 18 if 'TRUSTED_ENV' not in env: |
| 20 Return() | 19 Return() |
| 21 trusted_env = env['TRUSTED_ENV'] | 20 trusted_env = env['TRUSTED_ENV'] |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 declares_exit_status=True) | 64 declares_exit_status=True) |
| 66 env.AddNodeToTestSuite(node, test_suites, | 65 env.AddNodeToTestSuite(node, test_suites, |
| 67 'run_mach_unforwarded_trusted_crash_test', | 66 'run_mach_unforwarded_trusted_crash_test', |
| 68 is_broken=is_broken) | 67 is_broken=is_broken) |
| 69 | 68 |
| 70 node = env.CommandTest('mach_forward_early_trusted_crash_test.out', | 69 node = env.CommandTest('mach_forward_early_trusted_crash_test.out', |
| 71 [runner, 'early_trusted'], declares_exit_status=True) | 70 [runner, 'early_trusted'], declares_exit_status=True) |
| 72 env.AddNodeToTestSuite(node, test_suites, | 71 env.AddNodeToTestSuite(node, test_suites, |
| 73 'run_mach_forward_early_trusted_crash_test', | 72 'run_mach_forward_early_trusted_crash_test', |
| 74 is_broken=is_broken) | 73 is_broken=is_broken) |
| OLD | NEW |