| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 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 if not env.AllowInlineAssembly(): | 8 if not env.AllowInlineAssembly(): |
| 9 Return() | 9 Return() |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 for subtest in ('test_bad_handler', | 35 for subtest in ('test_bad_handler', |
| 36 'test_stack_outside_sandbox', | 36 'test_stack_outside_sandbox', |
| 37 'test_stack_in_rwdata', | 37 'test_stack_in_rwdata', |
| 38 'test_stack_in_rodata', | 38 'test_stack_in_rodata', |
| 39 'test_stack_in_code', | 39 'test_stack_in_code', |
| 40 'test_crash_in_syscall'): | 40 'test_crash_in_syscall'): |
| 41 node = env.CommandSelLdrTestNacl( | 41 node = env.CommandSelLdrTestNacl( |
| 42 'exception_%s.out' % subtest, | 42 'exception_%s.out' % subtest, |
| 43 exception_crash_test, [subtest], **test_args) | 43 exception_crash_test, [subtest], **test_args) |
| 44 # test_bad_handler hangs in ARM QEMU. | 44 # test_bad_handler hangs in ARM and MIPS QEMU. |
| 45 subtest_is_broken = (subtest == 'test_bad_handler' and | 45 subtest_is_broken = (subtest == 'test_bad_handler' and |
| 46 env.Bit('target_arm') and env.UsingEmulator()) | 46 (env.Bit('target_arm') or env.Bit('target_mips32')) |
| 47 and env.UsingEmulator()) |
| 47 env.AddNodeToTestSuite( | 48 env.AddNodeToTestSuite( |
| 48 node, ['small_tests', 'exception_tests'], | 49 node, ['small_tests', 'exception_tests'], |
| 49 'run_exception_%s' % subtest, | 50 'run_exception_%s' % subtest, |
| 50 is_broken=subtest_is_broken) | 51 is_broken=subtest_is_broken) |
| 51 | 52 |
| 52 | 53 |
| 53 exceptions_disabled_test = env.ComponentProgram( | 54 exceptions_disabled_test = env.ComponentProgram( |
| 54 'exceptions_disabled_test', | 55 'exceptions_disabled_test', |
| 55 ['exceptions_disabled_test.c'], | 56 ['exceptions_disabled_test.c'], |
| 56 EXTRA_LIBS=['${NONIRT_LIBS}']) | 57 EXTRA_LIBS=['${NONIRT_LIBS}']) |
| 57 node = env.CommandSelLdrTestNacl( | 58 node = env.CommandSelLdrTestNacl( |
| 58 'exceptions_disabled_test.out', | 59 'exceptions_disabled_test.out', |
| 59 exceptions_disabled_test, [], | 60 exceptions_disabled_test, [], |
| 60 declares_exit_status=True) | 61 declares_exit_status=True) |
| 61 env.AddNodeToTestSuite( | 62 env.AddNodeToTestSuite( |
| 62 node, ['small_tests', 'exception_tests'], | 63 node, ['small_tests', 'exception_tests'], |
| 63 'run_exceptions_disabled_test') | 64 'run_exceptions_disabled_test') |
| OLD | NEW |