| Index: SConstruct
|
| diff --git a/SConstruct b/SConstruct
|
| index 25bbba72635717dba24bad1c7a491de0b40e1b1d..244da651c6044f7113ac0f66e0865a07f185fc25 100755
|
| --- a/SConstruct
|
| +++ b/SConstruct
|
| @@ -1896,8 +1896,12 @@ def CommandTest(env, name, command, size='small', direct_emulation=True,
|
| # ASan normally intercepts SIGSEGV and SIGFPE and disables our signal
|
| # handlers, which interferes with various NaCl tests, including the
|
| # platform qualification test built into sel_ldr. We fix this by telling
|
| - # ASan not to mess with SIGSEGV or SIGFPE.
|
| + # ASan not to mess with SIGSEGV and SIGFPE.
|
| asan_options = ['handle_segv=0', 'handle_sigfpe=0']
|
| + # ASan aborts on errors rather than exits. This changes the expected exit
|
| + # codes for some tests.
|
| + asan_options.append('abort_on_error=0')
|
| +
|
| if env.Bit('host_mac') and int(platform.mac_ver()[0].split('.')[1]) < 7:
|
| # MacOS 10.6 has a bug in the libsandbox system library where it
|
| # makes a memcmp call that reads off the end of a malloc'd block.
|
|
|