Commit c5653b5f authored by ncbray@chromium.org's avatar ncbray@chromium.org

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
parent 82428884
...@@ -30,11 +30,14 @@ void DisableOSCrashDumps() { ...@@ -30,11 +30,14 @@ void DisableOSCrashDumps() {
// bsd/uxkern/ux_exception.c and machine_exception() in xnu's // bsd/uxkern/ux_exception.c and machine_exception() in xnu's
// bsd/dev/*/unix_signal.c. // bsd/dev/*/unix_signal.c.
const int signals_to_intercept[] = { const int signals_to_intercept[] = {
// Hardware faults
SIGILL, // EXC_BAD_INSTRUCTION SIGILL, // EXC_BAD_INSTRUCTION
SIGTRAP, // EXC_BREAKPOINT SIGTRAP, // EXC_BREAKPOINT
SIGFPE, // EXC_ARITHMETIC SIGFPE, // EXC_ARITHMETIC
SIGBUS, // EXC_BAD_ACCESS 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. // For all these signals, just wire things up so we exit immediately.
......
...@@ -197,24 +197,6 @@ function runTests() { ...@@ -197,24 +197,6 @@ function runTests() {
<!-- The tests will create and remove embeds from this div. --> <!-- The tests will create and remove embeds from this div. -->
<div id="embeds"></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"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
runTests(); runTests();
......
...@@ -87,9 +87,7 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, ProgressEvents, { ...@@ -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 // allowed. Also not run on GLibc because it's a large test that is at risk of
// causing timeouts. // causing timeouts.
// crbug/338444 // crbug/338444
// crbug.com/375103: fails on Mac after open sourcing PDF plugin. #if defined(OS_WIN)
// crbug.com/375103: fails on Linux too after open sourcing PDF plugin.
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
#define MAYBE_Bad DISABLED_Bad #define MAYBE_Bad DISABLED_Bad
#else #else
#define MAYBE_Bad Bad #define MAYBE_Bad Bad
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment