summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wifi/TEST_MAPPING8
-rw-r--r--wifi/tests/Android.bp2
-rw-r--r--wifi/tests/AndroidTest.xml2
3 files changed, 11 insertions, 1 deletions
diff --git a/wifi/TEST_MAPPING b/wifi/TEST_MAPPING
new file mode 100644
index 000000000000..a1787f84e57d
--- /dev/null
+++ b/wifi/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+ "mainline-presubmit": [
+ {
+ // Install com.google.android.wifi.apex and run FrameworksWifiApiTests.
+ "name": "FrameworksWifiApiTests[com.google.android.wifi.apex]"
+ }
+ ]
+}
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..5d0839b83dc6 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" />