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

Unified Diff: tests/trusted_crash/osx_crash_forwarding/mach_crash_forwarding_test.c

Issue 12207165: Mac x86_64: Mach exception support (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 7 years, 10 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: tests/trusted_crash/osx_crash_forwarding/mach_crash_forwarding_test.c
===================================================================
--- tests/trusted_crash/osx_crash_forwarding/mach_crash_forwarding_test.c (revision 10790)
+++ tests/trusted_crash/osx_crash_forwarding/mach_crash_forwarding_test.c (working copy)
@@ -16,6 +16,7 @@
#include "native_client/src/trusted/service_runtime/nacl_app.h"
#include "native_client/src/trusted/service_runtime/osx/crash_filter.h"
#include "native_client/src/trusted/service_runtime/osx/mach_exception_handler.h"
+#include "native_client/src/trusted/service_runtime/osx/mach_thread_map.h"
#include "native_client/src/trusted/service_runtime/sel_ldr.h"
@@ -126,6 +127,7 @@
CHECK(NaClInterceptMachExceptions());
if (argc == 2 && strcmp(argv[1], "early_trusted") == 0) {
+ NaClInitMachThreadMap();
g_expect_crash = 1;
/* Cause a crash. */
*(volatile int *) 0 = 0;
@@ -138,11 +140,11 @@
if (strcmp(argv[1], "trusted") == 0) {
g_expect_crash = 1;
} else if (strcmp(argv[1], "unforwarded_trusted") == 0) {
- fprintf(stderr, "** intended_exit_status=-10\n");
+ fprintf(stderr, "** intended_exit_status=trusted_segfault\n");
g_expect_crash = 0;
} else if (strcmp(argv[1], "untrusted") == 0) {
/* Expect the test to crash; untrusted crashes shouldn't be propagated. */
- fprintf(stderr, "** intended_exit_status=-10\n");
+ fprintf(stderr, "** intended_exit_status=untrusted_segfault\n");
g_expect_crash = 0;
} else if (strcmp(argv[1], "untrusted_caught") == 0) {
g_expect_crash = 0;

Powered by Google App Engine
This is Rietveld 408576698