Index: minidump/minidump_system_info_writer_test.cc |
diff --git a/minidump/minidump_system_info_writer_test.cc b/minidump/minidump_system_info_writer_test.cc |
index 27963a20e35d213760c151dcf91756d4c8e91344..ce154332becab125d2d6d588f7acad89f229e244 100644 |
--- a/minidump/minidump_system_info_writer_test.cc |
+++ b/minidump/minidump_system_info_writer_test.cc |
@@ -26,6 +26,7 @@ |
namespace { |
using namespace crashpad; |
+using namespace testing; |
void GetSystemInfoStream(const std::string& file_contents, |
size_t csd_version_length, |
@@ -92,6 +93,9 @@ TEST(MinidumpSystemInfoWriter, Empty) { |
const MINIDUMP_STRING* csd_version; |
GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version); |
+ if (Test::HasFatalFailure()) { |
+ return; |
+ } |
EXPECT_EQ(kMinidumpCPUArchitectureUnknown, |
system_info->ProcessorArchitecture); |
@@ -163,6 +167,9 @@ TEST(MinidumpSystemInfoWriter, X86_Win) { |
GetSystemInfoStream( |
file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version); |
+ if (Test::HasFatalFailure()) { |
+ return; |
+ } |
EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture); |
EXPECT_EQ(kCPULevel, system_info->ProcessorLevel); |
@@ -223,6 +230,9 @@ TEST(MinidumpSystemInfoWriter, X86_64_Mac) { |
GetSystemInfoStream( |
file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version); |
+ if (Test::HasFatalFailure()) { |
+ return; |
+ } |
EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture); |
EXPECT_EQ(kCPULevel, system_info->ProcessorLevel); |
@@ -264,6 +274,9 @@ TEST(MinidumpSystemInfoWriter, X86_CPUVendorFromRegisters) { |
const MINIDUMP_STRING* csd_version; |
GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version); |
+ if (Test::HasFatalFailure()) { |
+ return; |
+ } |
EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture); |
EXPECT_EQ(0u, system_info->ProcessorLevel); |