diff options
| -rw-r--r-- | wifi/TEST_MAPPING | 13 | ||||
| -rw-r--r-- | wifi/tests/Android.bp | 2 | ||||
| -rw-r--r-- | wifi/tests/AndroidTest.xml | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/wifi/TEST_MAPPING b/wifi/TEST_MAPPING index fde3a6aa993c..8c515109a309 100644 --- a/wifi/TEST_MAPPING +++ b/wifi/TEST_MAPPING @@ -8,5 +8,18 @@ } ] } + ], + "mainline-presubmit": [ + { + "name": "FrameworksWifiApiTests[com.google.android.wifi.apex]" + }, + { + "name": "CtsWifiTestCases[com.google.android.wifi.apex]", + "options": [ + { + "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported" + } + ] + } ] } diff --git a/wifi/tests/Android.bp b/wifi/tests/Android.bp index 6a39959e8cfd..cb9693d3869e 100644 --- a/wifi/tests/Android.bp +++ b/wifi/tests/Android.bp @@ -44,7 +44,7 @@ android_test { ], test_suites: [ - "device-tests", + "general-tests", "mts", ], } diff --git a/wifi/tests/AndroidTest.xml b/wifi/tests/AndroidTest.xml index 34e2e3af9cda..2cdaddb59018 100644 --- a/wifi/tests/AndroidTest.xml +++ b/wifi/tests/AndroidTest.xml @@ -20,6 +20,8 @@ <option name="test-suite-tag" value="apct" /> <option name="test-tag" value="FrameworksWifiApiTests" /> + <option name="config-descriptor:metadata" key="mainline-param" + value="com.google.android.wifi.apex" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="android.net.wifi.test" /> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> |