Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(608)

Side by Side Diff: tests/exception_test/nacl.scons

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
Patch Set: workaround part 2 Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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',
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')
22
19 exception_test = env.ComponentProgram( 23 exception_test = env.ComponentProgram(
20 env.ProgramNameForNmf('exception_test'), 24 env.ProgramNameForNmf('exception_test'),
21 ['exception_test.c'] + helper_files, 25 ['exception_test.c'] + helper_files,
22 EXTRA_LIBS=['${NONIRT_LIBS}', '${PTHREAD_LIBS}', '${TESTRUNNER_LIBS}', 26 EXTRA_LIBS=['${NONIRT_LIBS}', '${PTHREAD_LIBS}', '${TESTRUNNER_LIBS}',
23 '${EXCEPTION_LIBS}', 'test_common']) 27 '${EXCEPTION_LIBS}', 'test_common'])
24 28
25 node = env.CommandSelLdrTestNacl( 29 node = env.CommandSelLdrTestNacl(
26 'exception_test.out', exception_test, **test_args) 30 'exception_test.out', exception_test, **test_args)
27 env.AddNodeToTestSuite( 31 env.AddNodeToTestSuite(
28 node, ['small_tests', 'exception_tests'], 'run_exception_test') 32 node, ['small_tests', 'exception_tests'], 'run_exception_test')
(...skipping 24 matching lines...) Expand all
53 'exceptions_disabled_test', 57 'exceptions_disabled_test',
54 ['exceptions_disabled_test.c'], 58 ['exceptions_disabled_test.c'],
55 EXTRA_LIBS=['${NONIRT_LIBS}', '${EXCEPTION_LIBS}']) 59 EXTRA_LIBS=['${NONIRT_LIBS}', '${EXCEPTION_LIBS}'])
56 node = env.CommandSelLdrTestNacl( 60 node = env.CommandSelLdrTestNacl(
57 'exceptions_disabled_test.out', 61 'exceptions_disabled_test.out',
58 exceptions_disabled_test, [], 62 exceptions_disabled_test, [],
59 declares_exit_status=True) 63 declares_exit_status=True)
60 env.AddNodeToTestSuite( 64 env.AddNodeToTestSuite(
61 node, ['small_tests', 'exception_tests'], 65 node, ['small_tests', 'exception_tests'],
62 'run_exceptions_disabled_test') 66 'run_exceptions_disabled_test')
OLDNEW
« tests/exception_test/exception_test.c ('K') | « tests/exception_test/exception_test.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698