| Index: sandbox/linux/tests/unit_tests.cc
|
| diff --git a/sandbox/linux/tests/unit_tests.cc b/sandbox/linux/tests/unit_tests.cc
|
| index 8734bd11630f5511cd269c761516aa5be5b92eca..660053b5845bf2170e50c6eb69bb22788802ddf7 100644
|
| --- a/sandbox/linux/tests/unit_tests.cc
|
| +++ b/sandbox/linux/tests/unit_tests.cc
|
| @@ -288,12 +288,14 @@ void UnitTests::DeathMessage(int status,
|
| bool subprocess_exited_without_matching_message =
|
| msg.find(expected_msg) == std::string::npos;
|
|
|
| -// In official builds CHECK messages are dropped, so look for SIGABRT.
|
| -// See https://code.google.com/p/chromium/issues/detail?id=437312
|
| +// In official builds CHECK messages are dropped, so look for SIGABRT or SIGILL.
|
| +// See https://crbug.com/437312 and https://crbug.com/612507.
|
| #if defined(OFFICIAL_BUILD) && defined(NDEBUG) && !defined(OS_ANDROID)
|
| if (subprocess_exited_without_matching_message) {
|
| + static const char kSigIllegalMessage[] = "Received signal 4";
|
| static const char kSigAbortMessage[] = "Received signal 6";
|
| subprocess_exited_without_matching_message =
|
| + msg.find(kSigIllegalMessage) == std::string::npos &&
|
| msg.find(kSigAbortMessage) == std::string::npos;
|
| }
|
| #endif
|
|
|