Chromium Code Reviews| Index: tests/exception_test/nacl.scons |
| diff --git a/tests/exception_test/nacl.scons b/tests/exception_test/nacl.scons |
| index 00f0bd67366538f49e3f1ea1fdaaedab10d98bbf..cdc1ead37bf1fb381ce965afbe787de4a33abe9b 100644 |
| --- a/tests/exception_test/nacl.scons |
| +++ b/tests/exception_test/nacl.scons |
| @@ -5,16 +5,32 @@ |
| Import('env') |
| -if not env.AllowInlineAssembly(): |
| +# yay |
| +if not env.AllowNonStableBitcode(): |
|
Junichi Uekawa
2014/09/05 08:37:18
Now this goes a bit further.
/ssd/nacl2/native_cl
|
| Return() |
| +# if not env.AllowInlineAssembly(): |
| +# Return() |
| +if env.Bit('nonsfi_nacl'): |
| + # Specifying the target arch is necessary for using inline assembly in pNaCl. |
| + if env.Bit('target_x86_32'): |
| + env.Append(CCFLAGS=['--target=i686-unknown-nacl', |
| + '--pnacl-allow-translate']) |
| + elif env.Bit('target_arm'): |
| + env.Append(CCFLAGS=['--target=arm-unknown-nacl', '-mfloat-abi=hard']) |
| + else: |
| + raise Exception('Unsupported architecture') |
| + # env.SetBits('nonstable_bitcode') |
| + env.Append(LINKFLAGS=['--pnacl-disable-abi-check']) |
| + |
| 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 this for NonSFI NaCl. |
| helper_files.append('direction_flag_x86.S') |
| exception_test = env.ComponentProgram( |
| env.ProgramNameForNmf('exception_test'), |