Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc

Issue 2236493004: Update Crashpad to 56b14bceefcec03fc11b3222c435522922f65640 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc
index 18b00a953f8a6fcdfaf57eced410776753dc92db..23c58720e063046e47e7f47cdd4fc088c3a77172 100644
--- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc
+++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc
@@ -286,10 +286,15 @@ class TestMachOImageAnnotationsReader final
break;
case kCrashDyld:
- // dyld fatal errors result in the execution of an int3 instruction on
- // x86 and a trap instruction on ARM, both of which raise SIGTRAP.
- // 10.9.5 dyld-239.4/src/dyldStartup.s _dyld_fatal_error.
- SetExpectedChildTermination(kTerminationSignal, SIGTRAP);
+ // Prior to 10.12, dyld fatal errors result in the execution of an
scottmg 2016/08/10 22:29:34 Tabs we should fix upstream.
Mark Mentovai 2016/08/10 23:39:27 Guess PolyGerrit didn't highlight those. :(
+ // int3 instruction on x86 and a trap instruction on ARM, both of
+ // which raise SIGTRAP. 10.9.5 dyld-239.4/src/dyldStartup.s
+ // _dyld_fatal_error. This changed in 10.12 to use
+ // abort_with_payload(), which appears as SIGABRT to a waiting
+ // parent.
+ SetExpectedChildTermination(
+ kTerminationSignal,
+ MacOSXMinorVersion() < 12 ? SIGTRAP : SIGABRT);
break;
default:

Powered by Google App Engine
This is Rietveld 408576698