Index: tests/exception_test/nacl.scons |
diff --git a/tests/exception_test/nacl.scons b/tests/exception_test/nacl.scons |
index 00f0bd67366538f49e3f1ea1fdaaedab10d98bbf..09be3d3127b19c28f8fcc2134ed9a6e116c999fc 100644 |
--- a/tests/exception_test/nacl.scons |
+++ b/tests/exception_test/nacl.scons |
@@ -8,13 +8,19 @@ Import('env') |
if not env.AllowInlineAssembly(): |
Return() |
+env.Append(CPPDEFINES=[['NONSFI_MODE', |
+ str(int(env.Bit('nonsfi_nacl')))]]) |
+env.Append(CPPDEFINES=[['TESTS_USE_IRT', |
+ str(int(env.Bit('tests_use_irt')))]]) |
+ |
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'), |