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

Unified Diff: tests/exception_test/nacl.scons

Issue 544003002: NonSFI mode: Enable compiling exception_test for NonSFI NaCl on ARM (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: remove dependency to IRT implementation for now. Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: tests/exception_test/nacl.scons
diff --git a/tests/exception_test/nacl.scons b/tests/exception_test/nacl.scons
index 00f0bd67366538f49e3f1ea1fdaaedab10d98bbf..7506a3c41294d2b2e1d37f62a479830b6398eb0d 100644
--- a/tests/exception_test/nacl.scons
+++ b/tests/exception_test/nacl.scons
@@ -8,13 +8,17 @@ Import('env')
if not env.AllowInlineAssembly():
Return()
+env.Append(CPPDEFINES=[['NONSFI_MODE',
+ str(int(env.Bit('nonsfi_nacl')))]])
+
test_args = {'sel_ldr_flags': ['-e', '-E', 'OUTSIDE_BROWSER=1'],
'declares_exit_status': True}
if env.Bit('target_arm') and env.UsingEmulator():
test_args['sel_ldr_flags'].extend(['-E', 'UNDER_QEMU_ARM=1'])
helper_files = []
-if env.Bit('target_x86'):
+if env.Bit('target_x86') and not env.Bit('nonsfi_nacl'):
+ # TODO(uekawa): Enable for Non-SFI.
helper_files.append('direction_flag_x86.S')
exception_test = env.ComponentProgram(
env.ProgramNameForNmf('exception_test'),
« 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