| commit | 201b08314bd8cf55cb37cdb95de1e023023bd08c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 24 21:31:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 24 21:31:44 2021 +0000 |
| tree | bf907869209dc30ab883ed5393db977327f50afb | |
| parent | 03a6cfdc15c7e28a74985e5fa6b8c40af4800873 [diff] | |
| parent | 2e749339455083665428a0d91e350be7ad73c446 [diff] |
Merge "Allow VTS of 1.0 tetheroffload to be optional" am: 2e74933945 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1745384 Change-Id: Iaa017198d845c747ec5248aa75d78084a6a8ae8b
diff --git a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp index ad4ef12..ea9bcb5 100644 --- a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp +++ b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp
@@ -469,7 +469,7 @@ } } -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlHidlTestBase); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlTestV1_0_HalNotStarted); INSTANTIATE_TEST_CASE_P( PerInstance, OffloadControlTestV1_0_HalNotStarted, testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames( @@ -478,7 +478,7 @@ IOffloadControl::descriptor))), android::hardware::PrintInstanceTupleNameToString<>); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlHidlTest); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlTestV1_0_HalStarted); INSTANTIATE_TEST_CASE_P( PerInstance, OffloadControlTestV1_0_HalStarted, testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames(