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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
312 'nacl_fault_inject', | 312 'nacl_fault_inject', |
313 'platform', | 313 'platform', |
314 'platform_qual_lib', | 314 'platform_qual_lib', |
315 VALIDATOR_LIB, | 315 VALIDATOR_LIB, |
316 ] + DEBUG_LIBS | 316 ] + DEBUG_LIBS |
317 if ((not env.Bit('coverage_enabled') or not env.Bit('windows')) and | 317 if ((not env.Bit('coverage_enabled') or not env.Bit('windows')) and |
318 not env.CrossToolsBuild()): | 318 not env.CrossToolsBuild()): |
319 sel_main_objs = [env.ComponentObject('sel_main.c')] + r_debug_objs | 319 sel_main_objs = [env.ComponentObject('sel_main.c')] + r_debug_objs |
320 SEL_LDR_NODE = env.ComponentProgram('sel_ldr', sel_main_objs, | 320 SEL_LDR_NODE = env.ComponentProgram('sel_ldr', sel_main_objs, |
321 EXTRA_LIBS=sel_ldr_libs) | 321 EXTRA_LIBS=sel_ldr_libs) |
322 # TODO(bradnelson): drop once exceptions are available by default. | |
323 env_exc = env.Clone() | |
324 env_exc.Append(CPPDEFINES=['NACL_EXCEPTION_HANDLING_REQUESTED']) | |
325 exc_sel_main_objs = [ | |
326 env_exc.ComponentObject('sel_main_exc', 'sel_main.c')] + r_debug_objs | |
Mark Seaborn
2012/02/06 17:35:04
This sets a bad precedent. I don't want to start
bradn
2012/02/06 19:26:59
Done.
Odd, I didn't know the environment get propa
| |
327 exc_SEL_LDR_NODE = env_exc.ComponentProgram('sel_ldr_exc', exc_sel_main_objs, | |
328 EXTRA_LIBS=sel_ldr_libs) | |
322 if env.Bit('mac'): | 329 if env.Bit('mac'): |
323 # This target exists only to check that the service_runtime code | 330 # This target exists only to check that the service_runtime code |
324 # can successfully be linked into a Mac OS X dynamic library. Our | 331 # can successfully be linked into a Mac OS X dynamic library. Our |
325 # assembly code needs to be PIC-friendly and linkable in this | 332 # assembly code needs to be PIC-friendly and linkable in this |
326 # context, because it is linked into a dynamic library inside | 333 # context, because it is linked into a dynamic library inside |
327 # Chromium, and OS X is strict about TEXTRELs. Without this, the | 334 # Chromium, and OS X is strict about TEXTRELs. Without this, the |
328 # standalone build won't catch some mistakes that can break the | 335 # standalone build won't catch some mistakes that can break the |
329 # Chromium build. Linking a dylib here works because -fPIC is the | 336 # Chromium build. Linking a dylib here works because -fPIC is the |
330 # default for all C code on OS X. | 337 # default for all C code on OS X. |
331 dylib_env = env.Clone() | 338 dylib_env = env.Clone() |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
952 expected_exit_status = 'sigabrt' | 959 expected_exit_status = 'sigabrt' |
953 node = env.CommandTest( | 960 node = env.CommandTest( |
954 'sel_ldr_thread_death_test.out', | 961 'sel_ldr_thread_death_test.out', |
955 command=[sel_ldr_thread_death_test_exe], | 962 command=[sel_ldr_thread_death_test_exe], |
956 exit_status=expected_exit_status) | 963 exit_status=expected_exit_status) |
957 | 964 |
958 # TODO(tuduce): Make it work on windows. | 965 # TODO(tuduce): Make it work on windows. |
959 env.AddNodeToTestSuite(node, ['medium_tests'], | 966 env.AddNodeToTestSuite(node, ['medium_tests'], |
960 'run_sel_ldr_thread_death_test', | 967 'run_sel_ldr_thread_death_test', |
961 is_broken=env.Bit('windows')) | 968 is_broken=env.Bit('windows')) |
OLD | NEW |