diff options
| author | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 05:32:27 +0000 |
|---|---|---|
| committer | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 05:32:27 +0000 |
| commit | c5653b5f6f901b2739086aead9672c37be494584 (patch) | |
| tree | 7976d27ba43965732fca6831d127cf32d7199493 /base/mac | |
| parent | 8242888470877d61037bcf0e3a959db92989d728 (diff) | |
| download | chromium_src-c5653b5f6f901b2739086aead9672c37be494584.zip chromium_src-c5653b5f6f901b2739086aead9672c37be494584.tar.gz chromium_src-c5653b5f6f901b2739086aead9672c37be494584.tar.bz2 | |
Ensure the OSX crash catcher does not trigger on SIGABRT when disabled.
This CL also re-enables NaClBrowserTestNewlib.Bad. This test was
disabled because there were unautomated "visual tests" embeded in the
test's html. These embeds declared a pdf content type. When the PDF
plugin was open sourced, this content type started being recognized
and the test broke.
This test was historically flaky, however. One reason was that pauses
caused by the OS crash catcher could cause the test to time out. The
OS crash catcher was triggering because NaCl calls abort() in response
to many fatal errors. This test is being re-enabled to show abort is
no longer triggering the crash catcher.
BUG=375103
Review URL: https://codereview.chromium.org/347803004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
| -rw-r--r-- | base/mac/os_crash_dumps.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/base/mac/os_crash_dumps.cc b/base/mac/os_crash_dumps.cc index e50ac39..5d65b46 100644 --- a/base/mac/os_crash_dumps.cc +++ b/base/mac/os_crash_dumps.cc @@ -30,11 +30,14 @@ void DisableOSCrashDumps() { // bsd/uxkern/ux_exception.c and machine_exception() in xnu's // bsd/dev/*/unix_signal.c. const int signals_to_intercept[] = { + // Hardware faults SIGILL, // EXC_BAD_INSTRUCTION SIGTRAP, // EXC_BREAKPOINT SIGFPE, // EXC_ARITHMETIC SIGBUS, // EXC_BAD_ACCESS - SIGSEGV // EXC_BAD_ACCESS + SIGSEGV, // EXC_BAD_ACCESS + // Not a hardware fault + SIGABRT }; // For all these signals, just wire things up so we exit immediately. |