Fix iOS test with libc++ exception throw change. [crashpad/crashpad : main]
10 views
Skip to first unread message
Justin Cohen (Gerrit)
Mar 16, 2023, 11:11:01 PM3/16/23
to Robert Sesek, crashp...@chromium.org
Attention is currently required from: Robert Sesek.
Patch set 4:Commit-Queue +1
To view, visit change 4347775. To unsubscribe, or for help writing mail filters, visit settings.
Robert Sesek (Gerrit)
Mar 20, 2023, 12:53:52 PM3/20/23
to Justin Cohen, Robert Sesek, Crashpad LUCI CQ, crashp...@chromium.org
Attention is currently required from: Justin Cohen.
Patch set 5:Code-Review +1
Justin Cohen (Gerrit)
Mar 20, 2023, 2:59:13 PM3/20/23
to Robert Sesek, Crashpad LUCI CQ, crashp...@chromium.org
Attention is currently required from: Justin Cohen.
Patch set 5:Commit-Queue +2
Crashpad LUCI CQ (Gerrit)
Mar 20, 2023, 3:12:31 PM3/20/23
to Justin Cohen, Robert Sesek, crashp...@chromium.org
Crashpad LUCI CQ submitted this change.
Approvals:
Robert Sesek: Looks good to me
Justin Cohen: Commit
Fix iOS test with libc++ exception throw change.
After https://reviews.llvm.org/D141222 exceptions call into
__libcpp_verbose_abort, which Chromium sets to `brk 0` in release.
Bug: 1425429
Change-Id: Ie00d1317bb03fcb1f15fb5c41ab69640dfb564b7
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4347775
Reviewed-by: Robert Sesek <rse...@chromium.org>
Commit-Queue: Justin Cohen <justi...@chromium.org>
---
M test/ios/BUILD.gn
M test/ios/crash_type_xctest.mm
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/test/ios/BUILD.gn b/test/ios/BUILD.gn
index c17f461..6e4195a 100644
--- a/test/ios/BUILD.gn
+++ b/test/ios/BUILD.gn
@@ -66,7 +66,11 @@
source_set("xcuitests") {
testonly = true
sources = [ "crash_type_xctest.mm" ]
- configs += [ "../..:crashpad_config" ]
+ configs += [
+ "../..:crashpad_config",
+ "../../build:crashpad_is_in_chromium",
+ ]
+
deps = [
"../../build:ios_enable_arc",
"../../build:ios_xctest",
diff --git a/test/ios/crash_type_xctest.mm b/test/ios/crash_type_xctest.mm
index c1d2433..d73d359 100644
--- a/test/ios/crash_type_xctest.mm
+++ b/test/ios/crash_type_xctest.mm
@@ -150,10 +150,16 @@
- (void)testException {
[rootObject_ crashException];
+ // After https://reviews.llvm.org/D141222 exceptions call
+ // __libcpp_verbose_abort, which Chromium sets to `brk 0` in release.
+#if defined(CRASHPAD_IS_IN_CHROMIUM) && defined(NDEBUG)
+ [self verifyCrashReportException:SIGABRT];
+#else
[self verifyCrashReportException:EXC_SOFT_SIGNAL];
NSNumber* report_exception;
XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
XCTAssertEqual(report_exception.intValue, SIGABRT);
+#endif
}
- (void)testNSException {
To view, visit change 4347775. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages