summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Diwas Sharma <sdiwas@google.com> 2024-03-15 18:14:19 +0000
committer Diwas Sharma <sdiwas@google.com> 2024-04-10 00:45:35 +0000
commit009ab9d8586203658ed80331f8fe7158225bc6ff (patch)
treecc820b932a9080cb372ba5e796ea602ac177de06
parentf9bedec130aebb4d1544618d052cd5b8a4c206b7 (diff)
Add a dedicated Mainline Test Mapping group for WiFi
Test of *all* Mainline modules are currently configured in a single `mainline-presubmit` Test Mapping group. This requires that users indicate the module to install in every entry and is quite tedious. The above approach also adds overhead due to installing, checking for, and uninstalling Mainline modules between test module executions. This eats up precious presubmit time and gets runtimes close to violating the SLO. This change moves all WiFi Mainline module tests into a dedicated Test Mapping group that installs the Mainline module once before executing all test modules. This also simplifies the configuration syntax by no longer requiring brackets that indicate the, now implicit, Mainline module. Bug: 328102821 Test: ABTD test runs Change-Id: I6dda9f3c13e34867020a25ae7d0a072b206a87e8
-rw-r--r--TEST_MAPPING16
-rw-r--r--framework/TEST_MAPPING8
-rw-r--r--service/TEST_MAPPING5
3 files changed, 29 insertions, 0 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 0e93c9d139..c1dd1579a7 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -29,5 +29,21 @@
}
]
}
+ ],
+ "wifi-mainline-presubmit": [
+ {
+ "name": "MtsWifiTestCases"
+ },
+ {
+ "name": "CtsWifiTestCases",
+ "options": [
+ {
+ "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported"
+ },
+ {
+ "exclude-annotation": "com.android.compatibility.common.util.NonMainlineTest"
+ }
+ ]
+ }
]
}
diff --git a/framework/TEST_MAPPING b/framework/TEST_MAPPING
index 1eb3a9aa3c..d52846655b 100644
--- a/framework/TEST_MAPPING
+++ b/framework/TEST_MAPPING
@@ -18,5 +18,13 @@
{
"name": "FrameworksWifiTests[com.google.android.wifi.apex]"
}
+ ],
+ "wifi-mainline-presubmit": [
+ {
+ "name": "FrameworksWifiApiTests"
+ },
+ {
+ "name": "FrameworksWifiTests"
+ }
]
}
diff --git a/service/TEST_MAPPING b/service/TEST_MAPPING
index 3d2718482c..6bb0f8e31c 100644
--- a/service/TEST_MAPPING
+++ b/service/TEST_MAPPING
@@ -18,5 +18,10 @@
{
"name": "FrameworksWifiTests[com.google.android.wifi.apex]"
}
+ ],
+ "wifi-mainline-presubmit": [
+ {
+ "name": "FrameworksWifiTests"
+ }
]
}