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

Commit 8d092def authored by Haibo Huang's avatar Haibo Huang Committed by android-build-merger
Browse files

Merge "Fix build with new googletest" am: 01a3f134 

am: affe5e1e

Change-Id: Iaeb768a0031efbbd743630c112d24d0dc9f44544
parents cf935ef0 affe5e1e

fs_mgr/libsnapshot/snapshot_metadata_updater_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ TEST_P(SnapshotMetadataUpdaterTest, DeleteAndAddGroup) { 
    EXPECT_TRUE(CheckGroupName("product", "another_group"));

}



INSTANTIATE_TEST_SUITE_P(, SnapshotMetadataUpdaterTest, testing::Values(0, 1));

INSTANTIATE_TEST_SUITE_P(Snapshot, SnapshotMetadataUpdaterTest, testing::Values(0, 1));



}  // namespace snapshot

}  // namespace android

fs_mgr/libsnapshot/snapshot_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ TEST_P(FlashAfterUpdateTest, FlashSlotAfterUpdate) { 
    ASSERT_TRUE(new_sm->CancelUpdate());

}



INSTANTIATE_TEST_SUITE_P(, FlashAfterUpdateTest, Combine(Values(0, 1), Bool()),

INSTANTIATE_TEST_SUITE_P(Snapshot, FlashAfterUpdateTest, Combine(Values(0, 1), Bool()),

                         [](const TestParamInfo<FlashAfterUpdateTest::ParamType>& info) {

                             return "Flash"s + (std::get<0>(info.param) ? "New"s : "Old"s) +

                                    "Slot"s + (std::get<1>(info.param) ? "After"s : "Before"s) +

libprocessgroup/profiles/test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -33,14 +33,14 @@ JsonSchemaTestConfigFactory MakeTestParam(const std::string& path) { 
}



// Test suite instantiations

INSTANTIATE_TEST_SUITE_P(, JsonSchemaTest,

INSTANTIATE_TEST_SUITE_P(Cgroups, JsonSchemaTest,

                         ::testing::Values(MakeTestParam<Cgroups>("/cgroups.json"),

                                           MakeTestParam<Cgroups>("/cgroups.recovery.json"),

                                           MakeTestParam<TaskProfiles>("/task_profiles.json")));

INSTANTIATE_TEST_SUITE_P(, CgroupsTest,

INSTANTIATE_TEST_SUITE_P(Cgroups, CgroupsTest,

                         ::testing::Values(MakeTestParam<Cgroups>("/cgroups.json"),

                                           MakeTestParam<Cgroups>("/cgroups.recovery.json")));

INSTANTIATE_TEST_SUITE_P(, TaskProfilesTest,

INSTANTIATE_TEST_SUITE_P(TaskProfiles, TaskProfilesTest,

                         ::testing::Values(MakeTestParam<TaskProfiles>("/task_profiles.json")));



}  // namespace profiles

libunwindstack/tests/ArmExidxDecodeTest.cpp

+1 −1
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_SUITE_P(, ArmExidxDecodeTest,

INSTANTIATE_TEST_SUITE_P(Unwindstack, ArmExidxDecodeTest,

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



}  // namespace unwindstack