yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-09-07 12:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unit tests expecting no output when a microdump is suppressed.

Browse source 
BUG=

Change-Id: Ie4d190c68ecbd8709874a3f1ceb872b94b36914f
Reviewed-on: https://chromium-review.googlesource.com/419036
Reviewed-by: Primiano Tucci <primiano@chromium.org>
This commit is contained in:
Tobias Sargeant 2016-12-12 13:49:39 +00:00 committed by Tobias Sargeant
parent 5c42d7288a
commit f78d953511
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/client/linux/microdump_writer/microdump_writer_unittest.cc
View file

@ -75,9 +75,9 @@ MicrodumpExtraInfo MakeMicrodumpExtraInfo(
return info; return info;
} }
void AssertContainsMicrodump(const std::string& buf) { bool ContainsMicrodump(const std::string& buf) {
ASSERT_NE(std::string::npos, buf.find("-----BEGIN BREAKPAD MICRODUMP-----")); return std::string::npos != buf.find("-----BEGIN BREAKPAD MICRODUMP-----") &&
ASSERT_NE(std::string::npos, buf.find("-----END BREAKPAD MICRODUMP-----")); std::string::npos != buf.find("-----END BREAKPAD MICRODUMP-----");
} }
void CrashAndGetMicrodump(const MappingList& mappings, void CrashAndGetMicrodump(const MappingList& mappings,
@ -213,7 +213,7 @@ TEST(MicrodumpWriterTest, BasicWithMappings) {
std::string buf; std::string buf;
CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf); CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
AssertContainsMicrodump(buf); ASSERT_TRUE(ContainsMicrodump(buf));
#ifdef __LP64__ #ifdef __LP64__
ASSERT_NE(std::string::npos, ASSERT_NE(std::string::npos,
@ -246,7 +246,7 @@ TEST(MicrodumpWriterTest, NoOutputIfUninteresting) {
MappingList no_mappings; MappingList no_mappings;
CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfo, &buf); CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfo, &buf);
ASSERT_EQ(0U, buf.size()); ASSERT_FALSE(ContainsMicrodump(buf));
} }
// Ensure that output occurs if the interest region is set, and // Ensure that output occurs if the interest region is set, and
@ -268,7 +268,7 @@ TEST(MicrodumpWriterTest, OutputIfInteresting) {
MappingList no_mappings; MappingList no_mappings;
CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfo, &buf); CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfo, &buf);
ASSERT_LT(0U, buf.size()); ASSERT_TRUE(ContainsMicrodump(buf));
} }
// Ensure that the product info and build fingerprint metadata show up in the // Ensure that the product info and build fingerprint metadata show up in the
@ -285,7 +285,7 @@ TEST(MicrodumpWriterTest, BuildFingerprintAndProductInfo) {
MappingList no_mappings; MappingList no_mappings;
CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfo, &buf); CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfo, &buf);
AssertContainsMicrodump(buf); ASSERT_TRUE(ContainsMicrodump(buf));
CheckMicrodumpContents(buf, kMicrodumpExtraInfo); CheckMicrodumpContents(buf, kMicrodumpExtraInfo);
} }
@ -299,7 +299,7 @@ TEST(MicrodumpWriterTest, NoProductInfo) {
MakeMicrodumpExtraInfo(kBuildFingerprint, NULL, kGPUFingerprint)); MakeMicrodumpExtraInfo(kBuildFingerprint, NULL, kGPUFingerprint));
CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfoNoProductInfo, &buf); CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfoNoProductInfo, &buf);
AssertContainsMicrodump(buf); ASSERT_TRUE(ContainsMicrodump(buf));
CheckMicrodumpContents(buf, kBuildFingerprint, "UNKNOWN:0.0.0.0", CheckMicrodumpContents(buf, kBuildFingerprint, "UNKNOWN:0.0.0.0",
kGPUFingerprint); kGPUFingerprint);
} }
@ -314,7 +314,7 @@ TEST(MicrodumpWriterTest, NoGPUInfo) {
MakeMicrodumpExtraInfo(kBuildFingerprint, kProductInfo, NULL)); MakeMicrodumpExtraInfo(kBuildFingerprint, kProductInfo, NULL));
CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfoNoGPUInfo, &buf); CrashAndGetMicrodump(no_mappings, kMicrodumpExtraInfoNoGPUInfo, &buf);
AssertContainsMicrodump(buf); ASSERT_TRUE(ContainsMicrodump(buf));
CheckMicrodumpContents(buf, kBuildFingerprint, kProductInfo, "UNKNOWN"); CheckMicrodumpContents(buf, kBuildFingerprint, kProductInfo, "UNKNOWN");
} }
} // namespace } // namespace