| 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 ] | 161 ] |
| 162 elif env.Bit('mac'): | 162 elif env.Bit('mac'): |
| 163 env.Command( | 163 env.Command( |
| 164 [GENERATED + '/nacl_exc.h', GENERATED + '/nacl_exc_server.c'], | 164 [GENERATED + '/nacl_exc.h', GENERATED + '/nacl_exc_server.c'], |
| 165 ['osx/run_mig.py', '/usr/include/mach/exc.defs'], | 165 ['osx/run_mig.py', '/usr/include/mach/exc.defs'], |
| 166 '${PYTHON} ${SOURCES} ${TARGETS}') | 166 '${PYTHON} ${SOURCES} ${TARGETS}') |
| 167 ldr_inputs += [ | 167 ldr_inputs += [ |
| 168 GENERATED + '/nacl_exc_server.c', | 168 GENERATED + '/nacl_exc_server.c', |
| 169 'osx/crash_filter.c', | 169 'osx/crash_filter.c', |
| 170 'osx/mach_exception_handler.c', | 170 'osx/mach_exception_handler.c', |
| 171 'osx/mach_thread_map.c', |
| 171 'osx/nacl_ldt.c', | 172 'osx/nacl_ldt.c', |
| 172 'osx/nacl_thread_nice.c', | 173 'osx/nacl_thread_nice.c', |
| 173 'osx/outer_sandbox.c', | 174 'osx/outer_sandbox.c', |
| 174 'posix/addrspace_teardown.c', | 175 'posix/addrspace_teardown.c', |
| 175 'posix/sel_memory.c', | 176 'posix/sel_memory.c', |
| 176 'posix/x86/sel_segments.c', | 177 'posix/x86/sel_segments.c', |
| 177 ] | 178 ] |
| 178 elif env.Bit('linux'): | 179 elif env.Bit('linux'): |
| 179 ldr_inputs += [ | 180 ldr_inputs += [ |
| 180 'linux/nacl_bootstrap_args.c', | 181 'linux/nacl_bootstrap_args.c', |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1001 node = env.CommandTest( | 1002 node = env.CommandTest( |
| 1002 'nacl_error_log_test.out', | 1003 'nacl_error_log_test.out', |
| 1003 command=[exe], | 1004 command=[exe], |
| 1004 exit_status=expected_exit, | 1005 exit_status=expected_exit, |
| 1005 filter_regex='"(NaClCrashLogWriter.*)|(This is a test of the emergency.*)"', | 1006 filter_regex='"(NaClCrashLogWriter.*)|(This is a test of the emergency.*)"', |
| 1006 filter_group_only='true', | 1007 filter_group_only='true', |
| 1007 stdout_golden=env.File('nacl_error_log_test.stdout')) | 1008 stdout_golden=env.File('nacl_error_log_test.stdout')) |
| 1008 | 1009 |
| 1009 env.AddNodeToTestSuite(node, ['small_tests'], | 1010 env.AddNodeToTestSuite(node, ['small_tests'], |
| 1010 'run_nacl_error_log_test') | 1011 'run_nacl_error_log_test') |
| OLD | NEW |