diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index 793dd8cc7c..14a8509718 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -23,14 +23,14 @@ cc_library_static { "wifi_hidl_test_utils.cpp", ], export_include_dirs: [ - "." + ".", ], shared_libs: [ "libnativehelper", ], static_libs: [ "android.hardware.wifi@1.0", - "libwifi-system-iface" + "libwifi-system-iface", ], } @@ -49,9 +49,12 @@ cc_test { "android.hardware.wifi@1.1", "android.hardware.wifi@1.2", "android.hardware.wifi@1.3", - "libwifi-system-iface" + "libwifi-system-iface", + ], + test_suites: [ + "general-tests", + "vts", ], - test_suites: ["general-tests", "vts"], } // These tests are split out so that they can be conditioned on presence of the @@ -66,9 +69,12 @@ cc_test { static_libs: [ "VtsHalWifiV1_0TargetTestUtil", "android.hardware.wifi@1.0", - "libwifi-system-iface" + "libwifi-system-iface", + ], + test_suites: [ + "general-tests", + "vts", ], - test_suites: ["general-tests", "vts"], } // These tests are split out so that they can be conditioned on presence of @@ -83,7 +89,10 @@ cc_test { static_libs: [ "VtsHalWifiV1_0TargetTestUtil", "android.hardware.wifi@1.0", - "libwifi-system-iface" + "libwifi-system-iface", + ], + test_suites: [ + "general-tests", + "vts", ], - test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp index 1014c1dc68..3c9ed9ee23 100644 --- a/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp @@ -16,6 +16,7 @@ #include +#include #include #include #include @@ -38,6 +39,8 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode; class WifiRttControllerHidlTest : public ::testing::TestWithParam { public: virtual void SetUp() override { + if (!::testing::deviceSupportsFeature("android.hardware.wifi.rtt")) + GTEST_SKIP() << "Skipping this test since RTT is not supported."; // Make sure test starts with a clean state stopWifi(GetInstanceName()); } diff --git a/wifi/1.1/vts/functional/Android.bp b/wifi/1.1/vts/functional/Android.bp index eb68bc0ddc..7dc78e4519 100644 --- a/wifi/1.1/vts/functional/Android.bp +++ b/wifi/1.1/vts/functional/Android.bp @@ -18,14 +18,18 @@ cc_test { name: "VtsHalWifiV1_1TargetTest", defaults: ["VtsHalTargetTestDefaults"], srcs: [ - "wifi_chip_hidl_test.cpp"], + "wifi_chip_hidl_test.cpp", + ], static_libs: [ "VtsHalWifiV1_0TargetTestUtil", "android.hardware.wifi@1.0", "android.hardware.wifi@1.1", "android.hardware.wifi@1.2", "android.hardware.wifi@1.3", - "libwifi-system-iface" + "libwifi-system-iface", + ], + test_suites: [ + "general-tests", + "vts", ], - test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.2/vts/functional/Android.bp b/wifi/1.2/vts/functional/Android.bp index 90bcac1d33..159ba94340 100644 --- a/wifi/1.2/vts/functional/Android.bp +++ b/wifi/1.2/vts/functional/Android.bp @@ -27,10 +27,13 @@ cc_test { "android.hardware.wifi@1.1", "android.hardware.wifi@1.2", "android.hardware.wifi@1.3", - "libwifi-system-iface" + "libwifi-system-iface", ], disable_framework: true, - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], } cc_test { @@ -44,8 +47,10 @@ cc_test { "android.hardware.wifi@1.0", "android.hardware.wifi@1.1", "android.hardware.wifi@1.2", - "libwifi-system-iface" + "libwifi-system-iface", + ], + test_suites: [ + "general-tests", + "vts", ], - disable_framework: true, - test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp b/wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp index 96656f3c73..bc392a91ec 100644 --- a/wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp +++ b/wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp @@ -16,6 +16,7 @@ #include +#include #include #include #include @@ -50,6 +51,8 @@ android::sp getWifiNanIface_1_2( class WifiNanIfaceHidlTest : public ::testing::TestWithParam { public: virtual void SetUp() override { + if (!::testing::deviceSupportsFeature("android.hardware.wifi.aware")) + GTEST_SKIP() << "Skipping this test since NAN is not supported."; // Make sure to start with a clean state stopWifi(GetInstanceName()); diff --git a/wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp b/wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp index 24daee69f3..f6a1147e0d 100644 --- a/wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp +++ b/wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp @@ -16,6 +16,7 @@ #include +#include #include #include #include @@ -51,6 +52,8 @@ android::sp getWifiNanIface_1_4( class WifiNanIfaceHidlTest : public ::testing::TestWithParam { public: virtual void SetUp() override { + if (!::testing::deviceSupportsFeature("android.hardware.wifi.aware")) + GTEST_SKIP() << "Skipping this test since NAN is not supported."; // Make sure to start with a clean state stopWifi(GetInstanceName()); diff --git a/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp b/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp index 4035fb8f71..9d842234b7 100644 --- a/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp +++ b/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp @@ -19,6 +19,7 @@ #undef NAN // NAN is defined in bionic/libc/include/math.h:38 +#include #include #include #include @@ -59,6 +60,8 @@ using ::android::hardware::wifi::V1_4::RttResult; class WifiRttControllerHidlTest : public ::testing::TestWithParam { public: virtual void SetUp() override { + if (!::testing::deviceSupportsFeature("android.hardware.wifi.rtt")) + GTEST_SKIP() << "Skipping this test since RTT is not supported."; // Make sure to start with a clean state stopWifi(GetInstanceName());