| Index: third_party/crashpad/crashpad/util/mach/exception_types_test.cc
|
| diff --git a/third_party/crashpad/crashpad/util/mach/exception_types_test.cc b/third_party/crashpad/crashpad/util/mach/exception_types_test.cc
|
| index 4175c63799c4505342f9f1e1ae25b54e6edfd55c..ff09164e63603785baa93e66f5254b9339181769 100644
|
| --- a/third_party/crashpad/crashpad/util/mach/exception_types_test.cc
|
| +++ b/third_party/crashpad/crashpad/util/mach/exception_types_test.cc
|
| @@ -78,9 +78,9 @@ TEST(ExceptionTypes, ExcCrashRecoverOriginalException) {
|
| exception_type_t exception = ExcCrashRecoverOriginalException(
|
| test_data.code_0, &original_code_0, &signal);
|
|
|
| - EXPECT_EQ(test_data.exception, exception);
|
| - EXPECT_EQ(test_data.original_code_0, original_code_0);
|
| - EXPECT_EQ(test_data.signal, signal);
|
| + EXPECT_EQ(exception, test_data.exception);
|
| + EXPECT_EQ(original_code_0, test_data.original_code_0);
|
| + EXPECT_EQ(signal, test_data.signal);
|
| }
|
|
|
| // Now make sure that ExcCrashRecoverOriginalException() properly ignores
|
| @@ -88,20 +88,20 @@ TEST(ExceptionTypes, ExcCrashRecoverOriginalException) {
|
| static_assert(arraysize(kTestData) >= 1, "must have something to test");
|
| const TestData& test_data = kTestData[0];
|
| EXPECT_EQ(
|
| - test_data.exception,
|
| - ExcCrashRecoverOriginalException(test_data.code_0, nullptr, nullptr));
|
| + ExcCrashRecoverOriginalException(test_data.code_0, nullptr, nullptr),
|
| + test_data.exception);
|
|
|
| mach_exception_code_t original_code_0;
|
| - EXPECT_EQ(test_data.exception,
|
| - ExcCrashRecoverOriginalException(
|
| - test_data.code_0, &original_code_0, nullptr));
|
| - EXPECT_EQ(test_data.original_code_0, original_code_0);
|
| + EXPECT_EQ(ExcCrashRecoverOriginalException(
|
| + test_data.code_0, &original_code_0, nullptr),
|
| + test_data.exception);
|
| + EXPECT_EQ(original_code_0, test_data.original_code_0);
|
|
|
| int signal;
|
| EXPECT_EQ(
|
| - test_data.exception,
|
| - ExcCrashRecoverOriginalException(test_data.code_0, nullptr, &signal));
|
| - EXPECT_EQ(test_data.signal, signal);
|
| + ExcCrashRecoverOriginalException(test_data.code_0, nullptr, &signal),
|
| + test_data.exception);
|
| + EXPECT_EQ(signal, test_data.signal);
|
| }
|
|
|
| TEST(ExceptionTypes, ExcCrashCouldContainException) {
|
| @@ -250,7 +250,7 @@ TEST(ExceptionTypes, ExceptionCodeForMetrics) {
|
| int32_t metrics_code =
|
| ExceptionCodeForMetrics(test_data.exception, test_data.code_0);
|
|
|
| - EXPECT_EQ(test_data.metrics_code, metrics_code);
|
| + EXPECT_EQ(metrics_code, test_data.metrics_code);
|
| }
|
| }
|
|
|
|
|