Chromium Code Reviews Chromium Code Reviews
Issue 616813002:
Non-SFI Mode: Enable compiling exception_test for x86-32. (Closed)
Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master| 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 |
| 11 env.Append(CPPDEFINES=[['NONSFI_MODE', | |
|
Mark Seaborn
2014/10/01 17:04:00
Maybe add a comment: We #define NONSFI_MODE here b
Junichi Uekawa
2014/10/02 02:33:11
I found out why __native_client_nonsfi__ wasn't de
| |
| 12 str(int(env.Bit('nonsfi_nacl')))]]) | |
| 13 | |
| 11 test_args = {'sel_ldr_flags': ['-e', '-E', 'OUTSIDE_BROWSER=1'], | 14 test_args = {'sel_ldr_flags': ['-e', '-E', 'OUTSIDE_BROWSER=1'], |
| 12 'declares_exit_status': True} | 15 'declares_exit_status': True} |
| 13 if env.Bit('target_arm') and env.UsingEmulator(): | 16 if env.Bit('target_arm') and env.UsingEmulator(): |
| 14 test_args['sel_ldr_flags'].extend(['-E', 'UNDER_QEMU_ARM=1']) | 17 test_args['sel_ldr_flags'].extend(['-E', 'UNDER_QEMU_ARM=1']) |
| 15 | 18 |
| 16 helper_files = [] | 19 helper_files = [] |
| 17 if env.Bit('target_x86'): | 20 if env.Bit('target_x86'): |
| 18 helper_files.append('direction_flag_x86.S') | 21 helper_files.append('direction_flag_x86.S') |
| 19 exception_test = env.ComponentProgram( | 22 exception_test = env.ComponentProgram( |
| 20 env.ProgramNameForNmf('exception_test'), | 23 env.ProgramNameForNmf('exception_test'), |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 53 'exceptions_disabled_test', | 56 'exceptions_disabled_test', |
| 54 ['exceptions_disabled_test.c'], | 57 ['exceptions_disabled_test.c'], |
| 55 EXTRA_LIBS=['${NONIRT_LIBS}', '${EXCEPTION_LIBS}']) | 58 EXTRA_LIBS=['${NONIRT_LIBS}', '${EXCEPTION_LIBS}']) |
| 56 node = env.CommandSelLdrTestNacl( | 59 node = env.CommandSelLdrTestNacl( |
| 57 'exceptions_disabled_test.out', | 60 'exceptions_disabled_test.out', |
| 58 exceptions_disabled_test, [], | 61 exceptions_disabled_test, [], |
| 59 declares_exit_status=True) | 62 declares_exit_status=True) |
| 60 env.AddNodeToTestSuite( | 63 env.AddNodeToTestSuite( |
| 61 node, ['small_tests', 'exception_tests'], | 64 node, ['small_tests', 'exception_tests'], |
| 62 'run_exceptions_disabled_test') | 65 'run_exceptions_disabled_test') |
| OLD | NEW |
