Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f2048d3 authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Switch case to suite to follow new gtest naming."

parents 1e138919 7e21eba5

libunwindstack/tests/ArmExidxDecodeTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1662,7 +1662,7 @@ TEST_P(ArmExidxDecodeTest, eval_pc_set) { 
  ASSERT_EQ(0x10U, (*exidx_->regs())[15]);

}



INSTANTIATE_TEST_CASE_P(, ArmExidxDecodeTest,

INSTANTIATE_TEST_SUITE_P(, ArmExidxDecodeTest,

                         ::testing::Values("logging", "register_logging", "no_logging"));



}  // namespace unwindstack

libunwindstack/tests/DwarfCfaLogTest.cpp

+11 −11
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ class DwarfCfaLogTest : public ::testing::Test { 
  DwarfCie cie_;

  DwarfFde fde_;

};

TYPED_TEST_CASE_P(DwarfCfaLogTest);

TYPED_TEST_SUITE_P(DwarfCfaLogTest);



// NOTE: All class variable references have to be prefaced with this->.
@@ -763,7 +763,7 @@ TYPED_TEST_P(DwarfCfaLogTest, cfa_register_override) { 
  ASSERT_EQ("", GetFakeLogBuf());

}



REGISTER_TYPED_TEST_CASE_P(DwarfCfaLogTest, cfa_illegal, cfa_nop, cfa_offset, cfa_offset_extended,

REGISTER_TYPED_TEST_SUITE_P(DwarfCfaLogTest, cfa_illegal, cfa_nop, cfa_offset, cfa_offset_extended,

                            cfa_offset_extended_sf, cfa_restore, cfa_restore_extended, cfa_set_loc,

                            cfa_advance_loc, cfa_advance_loc1, cfa_advance_loc2, cfa_advance_loc4,

                            cfa_undefined, cfa_same, cfa_register, cfa_state,
@@ -774,6 +774,6 @@ REGISTER_TYPED_TEST_CASE_P(DwarfCfaLogTest, cfa_illegal, cfa_nop, cfa_offset, cf 
                            cfa_gnu_negative_offset_extended, cfa_register_override);



typedef ::testing::Types<uint32_t, uint64_t> DwarfCfaLogTestTypes;

INSTANTIATE_TYPED_TEST_CASE_P(, DwarfCfaLogTest, DwarfCfaLogTestTypes);

INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfCfaLogTest, DwarfCfaLogTestTypes);



}  // namespace unwindstack

libunwindstack/tests/DwarfCfaTest.cpp

+11 −10
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class DwarfCfaTest : public ::testing::Test { 
  DwarfCie cie_;

  DwarfFde fde_;

};

TYPED_TEST_CASE_P(DwarfCfaTest);

TYPED_TEST_SUITE_P(DwarfCfaTest);



// NOTE: All test class variables need to be referenced as this->.
@@ -952,16 +952,17 @@ TYPED_TEST_P(DwarfCfaTest, cfa_register_override) { 
  ASSERT_EQ("", GetFakeLogBuf());

}



REGISTER_TYPED_TEST_CASE_P(DwarfCfaTest, cfa_illegal, cfa_nop, cfa_offset, cfa_offset_extended,

REGISTER_TYPED_TEST_SUITE_P(DwarfCfaTest, cfa_illegal, cfa_nop, cfa_offset, cfa_offset_extended,

                            cfa_offset_extended_sf, cfa_restore, cfa_restore_extended, cfa_set_loc,

                            cfa_advance_loc1, cfa_advance_loc2, cfa_advance_loc4, cfa_undefined,

                            cfa_same, cfa_register, cfa_state, cfa_state_cfa_offset_restore,

                            cfa_def_cfa, cfa_def_cfa_sf, cfa_def_cfa_register, cfa_def_cfa_offset,

                            cfa_def_cfa_offset_sf, cfa_def_cfa_expression, cfa_expression,

                           cfa_val_offset, cfa_val_offset_sf, cfa_val_expression, cfa_gnu_args_size,

                           cfa_gnu_negative_offset_extended, cfa_register_override);

                            cfa_val_offset, cfa_val_offset_sf, cfa_val_expression,

                            cfa_gnu_args_size, cfa_gnu_negative_offset_extended,

                            cfa_register_override);



typedef ::testing::Types<uint32_t, uint64_t> DwarfCfaTestTypes;

INSTANTIATE_TYPED_TEST_CASE_P(, DwarfCfaTest, DwarfCfaTestTypes);

INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfCfaTest, DwarfCfaTestTypes);



}  // namespace unwindstack

libunwindstack/tests/DwarfDebugFrameTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class DwarfDebugFrameTest : public ::testing::Test { 
  MemoryFake memory_;

  DwarfDebugFrame<TypeParam>* debug_frame_ = nullptr;

};

TYPED_TEST_CASE_P(DwarfDebugFrameTest);

TYPED_TEST_SUITE_P(DwarfDebugFrameTest);



// NOTE: All test class variables need to be referenced as this->.
@@ -812,7 +812,7 @@ TYPED_TEST_P(DwarfDebugFrameTest, GetFdeFromPc_interleaved) { 
  EXPECT_EQ(0xb50U, fde->pc_end);

}



REGISTER_TYPED_TEST_CASE_P(

REGISTER_TYPED_TEST_SUITE_P(

    DwarfDebugFrameTest, GetFdes32, GetFdes32_after_GetFdeFromPc, GetFdes32_not_in_section,

    GetFdeFromPc32, GetFdeFromPc32_reverse, GetFdeFromPc32_not_in_section, GetFdes64,

    GetFdes64_after_GetFdeFromPc, GetFdes64_not_in_section, GetFdeFromPc64, GetFdeFromPc64_reverse,
@@ -825,6 +825,6 @@ REGISTER_TYPED_TEST_CASE_P( 
    GetFdeFromOffset64_lsda_address, GetFdeFromPc_interleaved);



typedef ::testing::Types<uint32_t, uint64_t> DwarfDebugFrameTestTypes;

INSTANTIATE_TYPED_TEST_CASE_P(, DwarfDebugFrameTest, DwarfDebugFrameTestTypes);

INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfDebugFrameTest, DwarfDebugFrameTestTypes);



}  // namespace unwindstack

libunwindstack/tests/DwarfEhFrameTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class DwarfEhFrameTest : public ::testing::Test { 
  MemoryFake memory_;

  DwarfEhFrame<TypeParam>* eh_frame_ = nullptr;

};

TYPED_TEST_CASE_P(DwarfEhFrameTest);

TYPED_TEST_SUITE_P(DwarfEhFrameTest);



// NOTE: All test class variables need to be referenced as this->.
@@ -125,9 +125,9 @@ TYPED_TEST_P(DwarfEhFrameTest, GetFdeCieFromOffset64) { 
  EXPECT_EQ(1U, cie->return_address_register);

}



REGISTER_TYPED_TEST_CASE_P(DwarfEhFrameTest, GetFdeCieFromOffset32, GetFdeCieFromOffset64);

REGISTER_TYPED_TEST_SUITE_P(DwarfEhFrameTest, GetFdeCieFromOffset32, GetFdeCieFromOffset64);



typedef ::testing::Types<uint32_t, uint64_t> DwarfEhFrameTestTypes;

INSTANTIATE_TYPED_TEST_CASE_P(, DwarfEhFrameTest, DwarfEhFrameTestTypes);

INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfEhFrameTest, DwarfEhFrameTestTypes);



}  // namespace unwindstack