Merge "Fix build with new googletest" am: a7e5d5fd5b am: 2fa0ae67f8

am: cdbd5ea3e7

Change-Id: I8665d1cfdff8120168a135b95644d6f80ea48fb5
This commit is contained in:
Haibo Huang
2019-11-08 17:40:58 -08:00
committed by android-build-merger
3 changed files with 3 additions and 3 deletions

View File

@@ -81,6 +81,6 @@ TEST_P(BootHidlTest, SetSnapshotMergeStatus) {
}
INSTANTIATE_TEST_SUITE_P(
, BootHidlTest,
PerInstance, BootHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(IBootControl::descriptor)),
android::hardware::PrintInstanceNameToString);

View File

@@ -252,7 +252,7 @@ TEST_P(HealthHidlTest, shouldKeepScreenOn) {
}
INSTANTIATE_TEST_SUITE_P(
, HealthHidlTest,
PerInstance, HealthHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(IHealth::descriptor)),
android::hardware::PrintInstanceNameToString);

View File

@@ -247,7 +247,7 @@ TEST_P(VibratorAidl, ExternalControlUnsupportedMatchingCapabilities) {
}
}
INSTANTIATE_TEST_SUITE_P(, VibratorAidl,
INSTANTIATE_TEST_SUITE_P(Vibrator, VibratorAidl,
testing::ValuesIn(android::getAidlHalInstanceNames(IVibrator::descriptor)),
android::PrintInstanceNameToString);