commit ec895ea9fbf1f5766e7f4daea14974cce970080a
author Lorenzo Colitti <lorenzo@google.com> Sat May 28 00:20:06 2022 +0900
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Jun 01 06:05:02 2022 +0000
tree d22fb2ab9d929cc2b94f93b8f05a9532936c6919
parent 35e3c6da1f7d669d6b22a60f0df8f4485a8af8be

Create CtsNetTestCasesMaxTargetSdk31.

This APK will only run tests that require target SDK 31 or below.

Bug: 233553525
Test: test-only change
Change-Id: Ia86187de50107748d8053194d3f7a55b7947412e
(cherry picked from commit 9e61b824042ea65f25e683ccc9faaa016742a412)
Merged-In: Ia86187de50107748d8053194d3f7a55b7947412e

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index c4c79c6..7eb935e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -34,6 +34,18 @@
         }
       ]
     },
+    // CTS tests that target older SDKs.
+    {
+      "name": "CtsNetTestCasesMaxTargetSdk31",
+      "options": [
+        {
+          "exclude-annotation": "com.android.testutils.SkipPresubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.RequiresDevice"
+        }
+      ]
+    },
     {
       "name": "bpf_existence_test"
     },
@@ -94,6 +106,17 @@
       ]
     },
     {
+      "name": "CtsNetTestCasesMaxTargetSdk31[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
+      "options": [
+        {
+          "exclude-annotation": "com.android.testutils.SkipPresubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.RequiresDevice"
+        }
+      ]
+    },
+    {
       "name": "bpf_existence_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
     },
     {