ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix build with new googletest"

Browse source 
am: 01a3f13452

Change-Id: Ie3a4476f479edefdb4661f5c2c3c3947fd0e3637
This commit is contained in:
Haibo Huang 2019-11-09 20:20:18 -08:00 • committed by android-build-merger
commit affe5e1eed
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/libsnapshot/snapshot_metadata_updater_test.cpp
View file

@ -325,7 +325,7 @@ TEST_P(SnapshotMetadataUpdaterTest, DeleteAndAddGroup) {
EXPECT_TRUE(CheckGroupName("product", "another_group")); 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 snapshot
} // namespace android } // namespace android

2
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -1338,7 +1338,7 @@ TEST_P(FlashAfterUpdateTest, FlashSlotAfterUpdate) {
ASSERT_TRUE(new_sm->CancelUpdate()); 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) { [](const TestParamInfo<FlashAfterUpdateTest::ParamType>& info) {
return "Flash"s + (std::get<0>(info.param) ? "New"s : "Old"s) + return "Flash"s + (std::get<0>(info.param) ? "New"s : "Old"s) +
"Slot"s + (std::get<1>(info.param) ? "After"s : "Before"s) + "Slot"s + (std::get<1>(info.param) ? "After"s : "Before"s) +

6
libprocessgroup/profiles/test.cpp
View file

@ -33,14 +33,14 @@ JsonSchemaTestConfigFactory MakeTestParam(const std::string& path) {
} }
// Test suite instantiations // Test suite instantiations
INSTANTIATE_TEST_SUITE_P(, JsonSchemaTest, INSTANTIATE_TEST_SUITE_P(Cgroups, JsonSchemaTest,
::testing::Values(MakeTestParam<Cgroups>("/cgroups.json"), ::testing::Values(MakeTestParam<Cgroups>("/cgroups.json"),
MakeTestParam<Cgroups>("/cgroups.recovery.json"), MakeTestParam<Cgroups>("/cgroups.recovery.json"),
MakeTestParam<TaskProfiles>("/task_profiles.json"))); MakeTestParam<TaskProfiles>("/task_profiles.json")));
INSTANTIATE_TEST_SUITE_P(, CgroupsTest, INSTANTIATE_TEST_SUITE_P(Cgroups, CgroupsTest,
::testing::Values(MakeTestParam<Cgroups>("/cgroups.json"), ::testing::Values(MakeTestParam<Cgroups>("/cgroups.json"),
MakeTestParam<Cgroups>("/cgroups.recovery.json"))); MakeTestParam<Cgroups>("/cgroups.recovery.json")));
INSTANTIATE_TEST_SUITE_P(, TaskProfilesTest, INSTANTIATE_TEST_SUITE_P(TaskProfiles, TaskProfilesTest,
::testing::Values(MakeTestParam<TaskProfiles>("/task_profiles.json"))); ::testing::Values(MakeTestParam<TaskProfiles>("/task_profiles.json")));
} // namespace profiles } // namespace profiles

2
libunwindstack/tests/ArmExidxDecodeTest.cpp
View file

@ -1662,7 +1662,7 @@ TEST_P(ArmExidxDecodeTest, eval_pc_set) {
ASSERT_EQ(0x10U, (*exidx_->regs())[15]); ASSERT_EQ(0x10U, (*exidx_->regs())[15]);
} }
INSTANTIATE_TEST_SUITE_P(, ArmExidxDecodeTest, INSTANTIATE_TEST_SUITE_P(Unwindstack, ArmExidxDecodeTest,
::testing::Values("logging", "register_logging", "no_logging")); ::testing::Values("logging", "register_logging", "no_logging"));
} // namespace unwindstack } // namespace unwindstack