| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 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 capture_nexe = env.ComponentProgram('nacl_thread_capture_test', | 8 capture_nexe = env.ComponentProgram('nacl_thread_capture_test', |
| 9 'nacl_thread_capture_test.c', | 9 'nacl_thread_capture_test.c', |
| 10 EXTRA_LIBS=['${NONIRT_LIBS}']) | 10 EXTRA_LIBS=['${NONIRT_LIBS}']) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 if trusted_env.Bit('linux') or trusted_env.Bit('mac'): | 24 if trusted_env.Bit('linux') or trusted_env.Bit('mac'): |
| 25 if env.Bit('target_x86_32'): | 25 if env.Bit('target_x86_32'): |
| 26 test_injection_files += [ | 26 test_injection_files += [ |
| 27 'arch/x86_32/thread_capture_test_injection.c'] | 27 'arch/x86_32/thread_capture_test_injection.c'] |
| 28 elif env.Bit('target_x86_64'): | 28 elif env.Bit('target_x86_64'): |
| 29 test_injection_files += [ | 29 test_injection_files += [ |
| 30 'arch/x86_64/thread_capture_test_injection.c'] | 30 'arch/x86_64/thread_capture_test_injection.c'] |
| 31 elif env.Bit('target_arm'): | 31 elif env.Bit('target_arm'): |
| 32 test_injection_files += [ | 32 test_injection_files += [ |
| 33 'arch/arm/thread_capture_test_injection.c'] | 33 'arch/arm/thread_capture_test_injection.c'] |
| 34 elif env.Bit('target_mips32'): |
| 35 test_injection_files += [ |
| 36 'arch/mips/thread_capture_test_injection.c'] |
| 34 else: | 37 else: |
| 35 raise Exception('Unsupported target') | 38 raise Exception('Unsupported target') |
| 36 | 39 |
| 37 custom_sel_ldr = trusted_env.ComponentProgram( | 40 custom_sel_ldr = trusted_env.ComponentProgram( |
| 38 'thread_capture_sel_ldr', | 41 'thread_capture_sel_ldr', |
| 39 test_injection_files, | 42 test_injection_files, |
| 40 EXTRA_LIBS=['sel_main']) | 43 EXTRA_LIBS=['sel_main']) |
| 41 | 44 |
| 42 node = env.CommandSelLdrTestNacl( | 45 node = env.CommandSelLdrTestNacl( |
| 43 'nacl_thread_capture_test.out', | 46 'nacl_thread_capture_test.out', |
| 44 capture_nexe, | 47 capture_nexe, |
| 45 loader=custom_sel_ldr) | 48 loader=custom_sel_ldr) |
| 46 | 49 |
| 47 # The run_nacl_thread_capture_test test failed on the asan bots, but | 50 # The run_nacl_thread_capture_test test failed on the asan bots, but |
| 48 # the failure could not be reproduced on a gprecise z620. Disable | 51 # the failure could not be reproduced on a gprecise z620. Disable |
| 49 # this test for now until we figure out the problem. | 52 # this test for now until we figure out the problem. |
| 50 env.AddNodeToTestSuite(node, | 53 env.AddNodeToTestSuite(node, |
| 51 ['small_tests', 'sel_ldr_tests'], | 54 ['small_tests', 'sel_ldr_tests'], |
| 52 'run_nacl_thread_capture_test', | 55 'run_nacl_thread_capture_test', |
| 53 is_broken=(env.Bit('running_on_valgrind') or | 56 is_broken=(env.Bit('running_on_valgrind') or |
| 54 trusted_env.Bit('asan'))) | 57 trusted_env.Bit('asan'))) |
| OLD | NEW |