update to newer googletest

This matches the version used in Chromium.

Change-Id: I1b697c7f79a4e628cecf96f6abc3e5dacac0888a
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2605357
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Mike Frysinger 2021-01-04 02:30:03 -05:00
parent 86c090b77f
commit f469cab97b
9 changed files with 25 additions and 21 deletions

2
DEPS
View file

@ -36,7 +36,7 @@ deps = {
# Testing libraries and utilities. # Testing libraries and utilities.
"src/src/testing": "src/src/testing":
"https://github.com/google/googletest.git" + "https://github.com/google/googletest.git" +
"@5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081", "@4fe018038f87675c083d0cfb6a6b57c274fb1753",
# Protobuf. # Protobuf.
"src/src/third_party/protobuf/protobuf": "src/src/third_party/protobuf/protobuf":

View file

@ -27,7 +27,7 @@
<project path='src/src/testing' <project path='src/src/testing'
name='google/googletest.git' name='google/googletest.git'
revision='5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081' revision='4fe018038f87675c083d0cfb6a6b57c274fb1753'
remote='github' /> remote='github' />
<project path='src/src/third_party/lss' <project path='src/src/third_party/lss'

View file

@ -204,7 +204,7 @@ TEST_P(DwarfHeader, Header) {
EXPECT_EQ(parser.Start(), info_contents.size()); EXPECT_EQ(parser.Start(), info_contents.size());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
HeaderVariants, DwarfHeader, HeaderVariants, DwarfHeader,
::testing::Values(DwarfHeaderParams(kLittleEndian, 4, 2, 4), ::testing::Values(DwarfHeaderParams(kLittleEndian, 4, 2, 4),
DwarfHeaderParams(kLittleEndian, 4, 2, 8), DwarfHeaderParams(kLittleEndian, 4, 2, 8),
@ -494,7 +494,7 @@ TEST_P(DwarfForms, implicit_const) {
// Tests for the other attribute forms could go here. // Tests for the other attribute forms could go here.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
HeaderVariants, DwarfForms, HeaderVariants, DwarfForms,
::testing::Values(DwarfHeaderParams(kLittleEndian, 4, 2, 4), ::testing::Values(DwarfHeaderParams(kLittleEndian, 4, 2, 4),
DwarfHeaderParams(kLittleEndian, 4, 2, 8), DwarfHeaderParams(kLittleEndian, 4, 2, 8),

View file

@ -55,6 +55,7 @@ using google_breakpad::Module;
using ::testing::_; using ::testing::_;
using ::testing::AtMost; using ::testing::AtMost;
using ::testing::DoAll;
using ::testing::Invoke; using ::testing::Invoke;
using ::testing::Return; using ::testing::Return;
using ::testing::Test; using ::testing::Test;
@ -857,8 +858,8 @@ Situation situations[] = {
class FuncLinePairing: public CUFixtureBase, class FuncLinePairing: public CUFixtureBase,
public TestWithParam<Situation> { }; public TestWithParam<Situation> { };
INSTANTIATE_TEST_CASE_P(AllSituations, FuncLinePairing, INSTANTIATE_TEST_SUITE_P(AllSituations, FuncLinePairing,
ValuesIn(situations)); ValuesIn(situations));
TEST_P(FuncLinePairing, Pairing) { TEST_P(FuncLinePairing, Pairing) {
const Situation& s = GetParam(); const Situation& s = GetParam();
@ -1043,11 +1044,11 @@ TEST_F(FuncLinePairing, WarnOnceLine) {
class CXXQualifiedNames: public CUFixtureBase, class CXXQualifiedNames: public CUFixtureBase,
public TestWithParam<DwarfTag> { }; public TestWithParam<DwarfTag> { };
INSTANTIATE_TEST_CASE_P(VersusEnclosures, CXXQualifiedNames, INSTANTIATE_TEST_SUITE_P(VersusEnclosures, CXXQualifiedNames,
Values(dwarf2reader::DW_TAG_class_type, Values(dwarf2reader::DW_TAG_class_type,
dwarf2reader::DW_TAG_structure_type, dwarf2reader::DW_TAG_structure_type,
dwarf2reader::DW_TAG_union_type, dwarf2reader::DW_TAG_union_type,
dwarf2reader::DW_TAG_namespace)); dwarf2reader::DW_TAG_namespace));
TEST_P(CXXQualifiedNames, TwoFunctions) { TEST_P(CXXQualifiedNames, TwoFunctions) {
DwarfTag tag = GetParam(); DwarfTag tag = GetParam();
@ -1145,8 +1146,8 @@ class QualifiedForLanguage
: public CUFixtureBase, : public CUFixtureBase,
public TestWithParam<LanguageAndQualifiedName> { }; public TestWithParam<LanguageAndQualifiedName> { };
INSTANTIATE_TEST_CASE_P(LanguageAndQualifiedName, QualifiedForLanguage, INSTANTIATE_TEST_SUITE_P(LanguageAndQualifiedName, QualifiedForLanguage,
ValuesIn(LanguageAndQualifiedNameCases)); ValuesIn(LanguageAndQualifiedNameCases));
TEST_P(QualifiedForLanguage, MemberFunction) { TEST_P(QualifiedForLanguage, MemberFunction) {
const LanguageAndQualifiedName& param = GetParam(); const LanguageAndQualifiedName& param = GetParam();

View file

@ -248,9 +248,9 @@ TEST_P(ELFSymbolsToModuleTest32, SkipStuff) {
} }
// Run all the 32-bit tests with both endianness // Run all the 32-bit tests with both endianness
INSTANTIATE_TEST_CASE_P(Endian, INSTANTIATE_TEST_SUITE_P(Endian,
ELFSymbolsToModuleTest32, ELFSymbolsToModuleTest32,
::testing::Values(kLittleEndian, kBigEndian)); ::testing::Values(kLittleEndian, kBigEndian));
// Similar tests, but with 64-bit values. Ostensibly this could be // Similar tests, but with 64-bit values. Ostensibly this could be
// shoehorned into the parameterization by using ::testing::Combine, // shoehorned into the parameterization by using ::testing::Combine,
@ -365,6 +365,6 @@ TEST_P(ELFSymbolsToModuleTest64, SkipStuff) {
} }
// Run all the 64-bit tests with both endianness // Run all the 64-bit tests with both endianness
INSTANTIATE_TEST_CASE_P(Endian, INSTANTIATE_TEST_SUITE_P(Endian,
ELFSymbolsToModuleTest64, ELFSymbolsToModuleTest64,
::testing::Values(kLittleEndian, kBigEndian)); ::testing::Values(kLittleEndian, kBigEndian));

View file

@ -56,6 +56,7 @@ using google_breakpad::StackwalkerAddressList;
using std::vector; using std::vector;
using testing::_; using testing::_;
using testing::AnyNumber; using testing::AnyNumber;
using testing::DoAll;
using testing::Return; using testing::Return;
using testing::SetArgumentPointee; using testing::SetArgumentPointee;

View file

@ -65,6 +65,7 @@ using google_breakpad::test_assembler::Section;
using std::vector; using std::vector;
using testing::_; using testing::_;
using testing::AnyNumber; using testing::AnyNumber;
using testing::DoAll;
using testing::Return; using testing::Return;
using testing::SetArgumentPointee; using testing::SetArgumentPointee;
using testing::Test; using testing::Test;

View file

@ -64,6 +64,7 @@ using google_breakpad::test_assembler::Section;
using std::vector; using std::vector;
using testing::_; using testing::_;
using testing::AnyNumber; using testing::AnyNumber;
using testing::DoAll;
using testing::Return; using testing::Return;
using testing::SetArgumentPointee; using testing::SetArgumentPointee;
using testing::Test; using testing::Test;

View file

@ -215,7 +215,7 @@ TEST_P(DumpSymsRegressionTest, EnsureDumpedSymbolsMatch) {
EXPECT_EQ(expected_symbols, symbols); EXPECT_EQ(expected_symbols, symbols);
} }
INSTANTIATE_TEST_CASE_P(DumpSyms, DumpSymsRegressionTest, INSTANTIATE_TEST_SUITE_P(DumpSyms, DumpSymsRegressionTest,
testing::ValuesIn(kRootNames)); testing::ValuesIn(kRootNames));
TEST_P(DumpSymsPEOnlyRegressionTest, EnsurePEOnlyDumpedSymbolsMatch) { TEST_P(DumpSymsPEOnlyRegressionTest, EnsurePEOnlyDumpedSymbolsMatch) {
@ -235,7 +235,7 @@ TEST_P(DumpSymsPEOnlyRegressionTest, EnsurePEOnlyDumpedSymbolsMatch) {
EXPECT_EQ(expected_symbols, symbols); EXPECT_EQ(expected_symbols, symbols);
} }
INSTANTIATE_TEST_CASE_P(PEOnlyDumpSyms, DumpSymsPEOnlyRegressionTest, INSTANTIATE_TEST_SUITE_P(PEOnlyDumpSyms, DumpSymsPEOnlyRegressionTest,
testing::ValuesIn(kPEOnlyRootNames)); testing::ValuesIn(kPEOnlyRootNames));