diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-31 21:59:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-31 21:59:52 +0000 |
| commit | 74459a32b095da8041718eaf0df482e4d90582e2 (patch) | |
| tree | 0bb1b03f54fcea513eb6b0ba760f63843c9df7a6 | |
| parent | 599c3cc6ab57b8a5c130b69d26b6cc1fb0e292f9 (diff) | |
| parent | ed9421e692cc6dfc114a7a53b18b0feb1a55708e (diff) | |
| download | interfaces-74459a32b095da8041718eaf0df482e4d90582e2.tar.gz | |
Merge "Allow uninstantiated netd HIDL tests" am: b570d34987 am: fa3eb45971 am: ed9421e692
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2406873
Change-Id: I3e9eb50d1379a4525a09e5c81855e315d1e86ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | net/netd/1.0/vts/functional/VtsHalNetNetdV1_0TargetTest.cpp | 1 | ||||
| -rw-r--r-- | net/netd/1.1/vts/functional/VtsHalNetNetdV1_1TargetTest.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/netd/1.0/vts/functional/VtsHalNetNetdV1_0TargetTest.cpp b/net/netd/1.0/vts/functional/VtsHalNetNetdV1_0TargetTest.cpp index 36699e9..b6edead 100644 --- a/net/netd/1.0/vts/functional/VtsHalNetNetdV1_0TargetTest.cpp +++ b/net/netd/1.0/vts/functional/VtsHalNetNetdV1_0TargetTest.cpp @@ -72,6 +72,7 @@ TEST_P(NetdHidlTest, TestDestroyOemNetworkInvalid) { ASSERT_EQ(INetd::StatusCode::INVALID_ARGUMENTS, retStatus); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NetdHidlTest); INSTANTIATE_TEST_SUITE_P( PerInstance, NetdHidlTest, testing::ValuesIn(android::hardware::getAllHalInstanceNames(INetd::descriptor)), diff --git a/net/netd/1.1/vts/functional/VtsHalNetNetdV1_1TargetTest.cpp b/net/netd/1.1/vts/functional/VtsHalNetNetdV1_1TargetTest.cpp index 51de786..1b23064 100644 --- a/net/netd/1.1/vts/functional/VtsHalNetNetdV1_1TargetTest.cpp +++ b/net/netd/1.1/vts/functional/VtsHalNetNetdV1_1TargetTest.cpp @@ -321,6 +321,7 @@ TEST_P(NetdHidlTest, TestForwarding) { EXPECT_EQ(0, countMatchingIpRules(regex2)); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NetdHidlTest); INSTANTIATE_TEST_SUITE_P( PerInstance, NetdHidlTest, testing::ValuesIn(android::hardware::getAllHalInstanceNames(INetd::descriptor)), |