| 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 platform | 6 import platform |
| 7 import os | 7 import os |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 'win/exception_patch/exit_fast.S', | 210 'win/exception_patch/exit_fast.S', |
| 211 'win/exception_patch/intercept.S', | 211 'win/exception_patch/intercept.S', |
| 212 'win/exception_patch/ntdll_patch.c', | 212 'win/exception_patch/ntdll_patch.c', |
| 213 'win/nacl_signal_64.c', | 213 'win/nacl_signal_64.c', |
| 214 ] | 214 ] |
| 215 else: | 215 else: |
| 216 raise Exception("Unsupported target") | 216 raise Exception("Unsupported target") |
| 217 | 217 |
| 218 if env.Bit('linux'): | 218 if env.Bit('linux'): |
| 219 ldr_inputs += [ | 219 ldr_inputs += [ |
| 220 'linux/thread_suspension.c', |
| 220 'posix/nacl_signal.c', | 221 'posix/nacl_signal.c', |
| 221 'posix/sel_addrspace_posix.c' | 222 'posix/sel_addrspace_posix.c' |
| 222 ] | 223 ] |
| 223 if env.Bit('target_arm'): | 224 if env.Bit('target_arm'): |
| 224 ldr_inputs += ['linux/nacl_signal_arm.c'] | 225 ldr_inputs += ['linux/nacl_signal_arm.c'] |
| 225 elif env.Bit('target_x86_32'): | 226 elif env.Bit('target_x86_32'): |
| 226 ldr_inputs += ['linux/nacl_signal_32.c'] | 227 ldr_inputs += ['linux/nacl_signal_32.c'] |
| 227 elif env.Bit('target_x86_64'): | 228 elif env.Bit('target_x86_64'): |
| 228 ldr_inputs += ['linux/nacl_signal_64.c'] | 229 ldr_inputs += ['linux/nacl_signal_64.c'] |
| 229 else: | 230 else: |
| 230 raise Exception("Unsupported target") | 231 raise Exception("Unsupported target") |
| 231 | 232 |
| 232 if env.Bit('mac'): | 233 if env.Bit('mac'): |
| 233 ldr_inputs += [ | 234 ldr_inputs += [ |
| 235 'generic/thread_suspension.c', |
| 234 'posix/nacl_signal.c', | 236 'posix/nacl_signal.c', |
| 235 'posix/sel_addrspace_posix.c' | 237 'posix/sel_addrspace_posix.c' |
| 236 ] | 238 ] |
| 237 if env.Bit('target_x86_32'): | 239 if env.Bit('target_x86_32'): |
| 238 ldr_inputs += ['osx/nacl_signal_32.c'] | 240 ldr_inputs += ['osx/nacl_signal_32.c'] |
| 239 elif env.Bit('target_x86_64'): | 241 elif env.Bit('target_x86_64'): |
| 240 ldr_inputs += ['osx/nacl_signal_64.c'] | 242 ldr_inputs += ['osx/nacl_signal_64.c'] |
| 241 else: | 243 else: |
| 242 raise Exception("Unsupported target") | 244 raise Exception("Unsupported target") |
| 243 | 245 |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 command=[env_cleanser_test_exe]) | 572 command=[env_cleanser_test_exe]) |
| 571 env.Requires(env_cleanser_test_exe, crt) | 573 env.Requires(env_cleanser_test_exe, crt) |
| 572 env.AddNodeToTestSuite(node, ['small_tests'], 'run_env_cleanser_test') | 574 env.AddNodeToTestSuite(node, ['small_tests'], 'run_env_cleanser_test') |
| 573 | 575 |
| 574 # Test nacl_signal | 576 # Test nacl_signal |
| 575 if (not env.Bit('coverage_enabled') and | 577 if (not env.Bit('coverage_enabled') and |
| 576 not env.Bit('target_arm') and | 578 not env.Bit('target_arm') and |
| 577 not env.IsRunningUnderValgrind()): | 579 not env.IsRunningUnderValgrind()): |
| 578 nacl_signal_exe = env.ComponentProgram('nacl_signal_unittest', | 580 nacl_signal_exe = env.ComponentProgram('nacl_signal_unittest', |
| 579 'nacl_signal_unittest.c', | 581 'nacl_signal_unittest.c', |
| 580 EXTRA_LIBS=['sel', | 582 EXTRA_LIBS=['sel', 'sel_debug_dummy']) |
| 581 'env_cleanser', | |
| 582 'nacl_perf_counter', | |
| 583 'gio_wrapped_desc', | |
| 584 'nacl_fault_inject', | |
| 585 'nacl_interval', | |
| 586 'platform', | |
| 587 ]) | |
| 588 node = env.CommandTest('nacl_signal_unittest.out', | 583 node = env.CommandTest('nacl_signal_unittest.out', |
| 589 command=[nacl_signal_exe], | 584 command=[nacl_signal_exe], |
| 590 exit_status='trusted_sigsegv_or_equivalent', | 585 exit_status='trusted_sigsegv_or_equivalent', |
| 591 using_nacl_signal_handler=True) | 586 using_nacl_signal_handler=True) |
| 592 | 587 |
| 593 env.Requires(nacl_signal_exe, crt) | 588 env.Requires(nacl_signal_exe, crt) |
| 594 env.AddNodeToTestSuite(node, ['small_tests'], 'run_nacl_signal_test') | 589 env.AddNodeToTestSuite(node, ['small_tests'], 'run_nacl_signal_test') |
| 595 | 590 |
| 596 if env.Bit('posix'): | 591 if env.Bit('posix'): |
| 597 test_prog = env.ComponentProgram('nacl_signal_frame_test', | 592 test_prog = env.ComponentProgram('nacl_signal_frame_test', |
| 598 'nacl_signal_frame_test.c', | 593 'nacl_signal_frame_test.c', |
| 599 EXTRA_LIBS=['sel', | 594 EXTRA_LIBS=['sel', 'sel_debug_dummy']) |
| 600 'env_cleanser', | |
| 601 'nacl_perf_counter', | |
| 602 'gio_wrapped_desc', | |
| 603 'nacl_fault_inject', | |
| 604 'nacl_interval', | |
| 605 'platform', | |
| 606 ]) | |
| 607 node = env.CommandTest('nacl_signal_frame_test.out', | 595 node = env.CommandTest('nacl_signal_frame_test.out', |
| 608 command=[test_prog], | 596 command=[test_prog], |
| 609 declares_exit_status=True, | 597 declares_exit_status=True, |
| 610 using_nacl_signal_handler=True) | 598 using_nacl_signal_handler=True) |
| 611 env.AddNodeToTestSuite(node, ['small_tests'], 'run_signal_frame_test') | 599 env.AddNodeToTestSuite(node, ['small_tests'], 'run_signal_frame_test') |
| 612 | 600 |
| 613 if env.Bit('windows') and env.Bit('target_x86_64'): | 601 if env.Bit('windows') and env.Bit('target_x86_64'): |
| 614 test_prog = env.ComponentProgram('patch_ntdll_test', | 602 test_prog = env.ComponentProgram('patch_ntdll_test', |
| 615 'win/exception_patch/ntdll_test.c', | 603 'win/exception_patch/ntdll_test.c', |
| 616 EXTRA_LIBS=['sel', | 604 EXTRA_LIBS=['sel', |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 955 # TODO(tuduce): Make it work on windows. | 943 # TODO(tuduce): Make it work on windows. |
| 956 env.AddNodeToTestSuite(node, ['medium_tests'], | 944 env.AddNodeToTestSuite(node, ['medium_tests'], |
| 957 'run_sel_ldr_thread_death_test', | 945 'run_sel_ldr_thread_death_test', |
| 958 is_broken=env.Bit('windows')) | 946 is_broken=env.Bit('windows')) |
| 959 | 947 |
| 960 | 948 |
| 961 # This currently tests linking of sel_main_chrome.c *only*. We do not | 949 # This currently tests linking of sel_main_chrome.c *only*. We do not |
| 962 # expect this program to do anything meaningful when run. | 950 # expect this program to do anything meaningful when run. |
| 963 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], | 951 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], |
| 964 EXTRA_LIBS=sel_ldr_libs) | 952 EXTRA_LIBS=sel_ldr_libs) |
| OLD | NEW |