summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-20 05:32:27 +0000
committerncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-20 05:32:27 +0000
commitc5653b5f6f901b2739086aead9672c37be494584 (patch)
tree7976d27ba43965732fca6831d127cf32d7199493
parent8242888470877d61037bcf0e3a959db92989d728 (diff)
downloadchromium_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
-rw-r--r--base/mac/os_crash_dumps.cc5
-rw-r--r--chrome/test/data/nacl/bad/ppapi_bad.html18
-rw-r--r--chrome/test/nacl/nacl_browsertest.cc4
3 files changed, 5 insertions, 22 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.
diff --git a/chrome/test/data/nacl/bad/ppapi_bad.html b/chrome/test/data/nacl/bad/ppapi_bad.html
index 4cb4285..01a3e6a 100644
--- a/chrome/test/data/nacl/bad/ppapi_bad.html
+++ b/chrome/test/data/nacl/bad/ppapi_bad.html
@@ -197,24 +197,6 @@ function runTests() {
<!-- The tests will create and remove embeds from this div. -->
<div id="embeds"></div>
-<!-- These two embeds are not automatically tested - visual inspection only. -->
-
-<embed id="cross_manifest_pdf"
- width=100 height=20
- src="http://www.google.com/crossorigin.manifest"
- style="background-color:gray"
- type="application/pdf" />
-
-<!-- This load would have succeeded if the NEXE was from a chrome-extension
- URL and NaCl had been registered as handling the PDF MIME type using
- the nacl_modules attribute in a Chrome extension manifest. -->
-
-<embed id="cross_origin_pdf"
- width=100 height=20
- src="ppapi_bad_crossorigin.nmf"
- style="background-color:gray"
- type="application/pdf" />
-
<script type="text/javascript">
//<![CDATA[
runTests();
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index cfbe37c6..377640d 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -87,9 +87,7 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, ProgressEvents, {
// allowed. Also not run on GLibc because it's a large test that is at risk of
// causing timeouts.
// crbug/338444
-// crbug.com/375103: fails on Mac after open sourcing PDF plugin.
-// crbug.com/375103: fails on Linux too after open sourcing PDF plugin.
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN)
#define MAYBE_Bad DISABLED_Bad
#else
#define MAYBE_Bad Bad