From 096b5ee6c79d94611523dde3af24b130c326c3e0 Mon Sep 17 00:00:00 2001
From: Rhed Jao <rhedjao@google.com>
Date: Fri, 18 Sep 2020 16:42:02 +0800
Subject: [PATCH] Updates more CtsContentTestCases to TEST_MAPPING

Bug: 158798848
Test: atest CtsContentTestCases:android.content.om.cts
Test: atest CtsContentTestCases:android.content.res.cts
Test: atest CtsContentTestCases:android.content.pm.cts
Change-Id: Ibd1d1de550e6cd15f0f3bd0b8b3245afdfe7fb75
---
 core/java/android/content/om/TEST_MAPPING          | 14 ++++++++++++++
 core/java/android/content/pm/TEST_MAPPING          | 14 ++++++++++++++
 core/java/android/content/res/TEST_MAPPING         | 14 ++++++++++++++
 .../core/java/com/android/server/pm/TEST_MAPPING   |  9 +++------
 4 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/core/java/android/content/om/TEST_MAPPING b/core/java/android/content/om/TEST_MAPPING
index d35dfdbf32c8f..d8f885439b342 100644
--- a/core/java/android/content/om/TEST_MAPPING
+++ b/core/java/android/content/om/TEST_MAPPING
@@ -21,6 +21,20 @@
           "include-filter": "android.appsecurity.cts.OverlayHostTest"
         }
       ]
+    },
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.om.cts"
+        }
+      ]
     }
   ]
 }
diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 1c98a1ffcbb64..953400e10e15f 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -17,6 +17,20 @@
     },
     {
       "name": "CarrierAppIntegrationTestCases"
+    },
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.pm.cts"
+        }
+      ]
     }
   ],
   "postsubmit": [
diff --git a/core/java/android/content/res/TEST_MAPPING b/core/java/android/content/res/TEST_MAPPING
index 9ebc9969a7301..c02af59ab72ef 100644
--- a/core/java/android/content/res/TEST_MAPPING
+++ b/core/java/android/content/res/TEST_MAPPING
@@ -2,6 +2,20 @@
   "presubmit": [
     {
       "name": "CtsResourcesLoaderTests"
+    },
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.res.cts"
+        }
+      ]
     }
   ]
 }
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index 4858682378958..7d48d0a6e2660 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -33,16 +33,13 @@
       "name": "CtsContentTestCases",
       "options": [
         {
-          "include-filter": "android.content.pm.cts.ChecksumsTest"
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
         },
         {
-          "include-filter": "android.content.pm.cts.PackageManagerShellCommandTest"
+          "exclude-annotation": "org.junit.Ignore"
         },
         {
-          "include-filter": "android.content.pm.cts.PackageManagerShellCommandIncrementalTest"
-        },
-        {
-          "include-filter": "android.content.pm.cts.PackageManagerTest"
+          "include-filter": "android.content.pm.cts"
         }
       ]
     },