diff options
author | Dan Shi <dshi@google.com> | 2020-09-15 23:06:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-15 23:06:07 +0000 |
commit | 6086e20a028a891a277cfac89b2a0647f966eb70 (patch) | |
tree | 7dea4001283eedb354854af5c4866638fedbe7a6 /wifi | |
parent | 3eb011c48777a0ad267bc94bb010469ac8385965 (diff) | |
parent | acfabe652f2fc3cbc14dc20c824f24c8354e2418 (diff) | |
download | platform_hardware_interfaces-6086e20a028a891a277cfac89b2a0647f966eb70.tar.gz platform_hardware_interfaces-6086e20a028a891a277cfac89b2a0647f966eb70.tar.bz2 platform_hardware_interfaces-6086e20a028a891a277cfac89b2a0647f966eb70.zip |
Merge "Suppress gtest error for tests without any instance" am: de3f15adc0 am: acfabe652f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1425889
Change-Id: I8b25839bef2f81a02590357dc7c3658ea4499f76
Diffstat (limited to 'wifi')
14 files changed, 14 insertions, 0 deletions
diff --git a/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp b/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp index 345cf312d4..2ff96bdfc1 100644 --- a/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp +++ b/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp @@ -309,6 +309,7 @@ TEST_P(HostapdHidlTest, AddInvalidPskAccessPointWithoutAcs) { EXPECT_NE(HostapdStatusCode::SUCCESS, status.code); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(HostapdHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, HostapdHidlTest, testing::Combine( diff --git a/wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp b/wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp index a39f064aab..62e3c16072 100644 --- a/wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp +++ b/wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp @@ -414,6 +414,7 @@ TEST_P(HostapdHidlTest, SetDebugParams) { EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(HostapdHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, HostapdHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp index 47f0394db1..ac39a24fa4 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp @@ -212,6 +212,7 @@ TEST_P(SupplicantHidlTest, SetConcurrencyPriority) { } } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp index c333c4f859..616869b26b 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp @@ -647,6 +647,7 @@ TEST_P(SupplicantP2pIfaceHidlTest, SetWfdDeviceInfo) { HIDL_INVOKE(p2p_iface_, setWfdDeviceInfo, kTestWfdDeviceInfo).code); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantP2pIfaceHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantP2pIfaceHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp index ff287541f8..e4fe52ca7e 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp @@ -558,6 +558,7 @@ TEST_P(SupplicantStaIfaceHidlTest, RemoveExtRadioWork) { HIDL_INVOKE(sta_iface_, removeExtRadioWork, kTestRadioWorkId).code); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaIfaceHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantStaIfaceHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp index 295ebfb808..7e93c5f4e9 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp @@ -839,6 +839,7 @@ TEST_P(SupplicantStaNetworkHidlTest, GetWpsNfcConfigurationToken) { EXPECT_FALSE(0 == status_and_token.second.size()); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaNetworkHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantStaNetworkHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp b/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp index 24a7ec31aa..0e404e7f96 100644 --- a/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp +++ b/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp @@ -149,6 +149,7 @@ static std::vector<std::string> get_wifi_instances() { return instances; } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.1/vts/functional/supplicant_sta_iface_hidl_test.cpp b/wifi/supplicant/1.1/vts/functional/supplicant_sta_iface_hidl_test.cpp index 8a1aeccf7d..2fade4493d 100644 --- a/wifi/supplicant/1.1/vts/functional/supplicant_sta_iface_hidl_test.cpp +++ b/wifi/supplicant/1.1/vts/functional/supplicant_sta_iface_hidl_test.cpp @@ -140,6 +140,7 @@ TEST_P(SupplicantStaIfaceHidlTest, RegisterCallback_1_1) { }); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaIfaceHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantStaIfaceHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.1/vts/functional/supplicant_sta_network_hidl_test.cpp b/wifi/supplicant/1.1/vts/functional/supplicant_sta_network_hidl_test.cpp index a4b7d40b53..bd8a2ab2f7 100644 --- a/wifi/supplicant/1.1/vts/functional/supplicant_sta_network_hidl_test.cpp +++ b/wifi/supplicant/1.1/vts/functional/supplicant_sta_network_hidl_test.cpp @@ -93,6 +93,7 @@ TEST_P(SupplicantStaNetworkHidlTest, SendNetworkEapIdentityResponse_1_1) { }); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaNetworkHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantStaNetworkHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp index cab160bc1f..75512d7035 100644 --- a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp +++ b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp @@ -162,6 +162,7 @@ TEST_P(SupplicantP2pIfaceHidlTest, EnableMacRandomization) { }); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantP2pIfaceHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantP2pIfaceHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_sta_iface_hidl_test.cpp b/wifi/supplicant/1.2/vts/functional/supplicant_sta_iface_hidl_test.cpp index 7377f780f2..184543b58d 100644 --- a/wifi/supplicant/1.2/vts/functional/supplicant_sta_iface_hidl_test.cpp +++ b/wifi/supplicant/1.2/vts/functional/supplicant_sta_iface_hidl_test.cpp @@ -460,6 +460,7 @@ TEST_P(SupplicantStaIfaceHidlTest, StartDppConfiguratorInitiator) { }); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaIfaceHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantStaIfaceHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_sta_network_hidl_test.cpp b/wifi/supplicant/1.2/vts/functional/supplicant_sta_network_hidl_test.cpp index 54ceb20211..5a2f808949 100644 --- a/wifi/supplicant/1.2/vts/functional/supplicant_sta_network_hidl_test.cpp +++ b/wifi/supplicant/1.2/vts/functional/supplicant_sta_network_hidl_test.cpp @@ -222,6 +222,7 @@ TEST_P(SupplicantStaNetworkHidlTest, EnableTlsSuiteBEapPhase1Param) { }); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaNetworkHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantStaNetworkHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp b/wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp index 011a955983..504ccc4e77 100644 --- a/wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp +++ b/wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp @@ -577,6 +577,7 @@ TEST_P(SupplicantStaIfaceHidlTest, FilsHlpFlushRequest) { EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code); }); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaIfaceHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantStaIfaceHidlTest, testing::Combine( diff --git a/wifi/supplicant/1.3/vts/functional/supplicant_sta_network_hidl_test.cpp b/wifi/supplicant/1.3/vts/functional/supplicant_sta_network_hidl_test.cpp index 5f60746845..11c55a6a20 100644 --- a/wifi/supplicant/1.3/vts/functional/supplicant_sta_network_hidl_test.cpp +++ b/wifi/supplicant/1.3/vts/functional/supplicant_sta_network_hidl_test.cpp @@ -348,6 +348,7 @@ TEST_P(SupplicantStaNetworkHidlTest, SetEapErp) { EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code); }); } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaNetworkHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantStaNetworkHidlTest, testing::Combine( |