From 6c7acfd69294ced4a3398d5f7b60ced5c4380511 Mon Sep 17 00:00:00 2001
From: Alan Stokes <alanstokes@google.com>
Date: Fri, 13 Dec 2019 14:07:54 +0000
Subject: [PATCH 1/2] Add PackageVerifierTests to presubmit.

Test: atest -p services/core/java/com/android/server/pm
Bug: 137937263
Bug: 135751498
Change-Id: Ifc0d24b09fd2152705e235c6fbd6bf629a2b0b71
---
 services/core/java/com/android/server/pm/TEST_MAPPING | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index e8798ffa37206..d01ea9a50573b 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -25,6 +25,14 @@
     },
     {
       "name": "PackageManagerShellCommandTest"
+    },
+    {
+      "name": "GtsSecurityHostTestCases",
+      "options": [
+        {
+          "include-filter": "com.google.android.security.gts.PackageVerifierTest"
+        }
+      ]
     }
   ],
   "postsubmit": [

From 5995bc587b0222c5ae37ba68b879782c7d494394 Mon Sep 17 00:00:00 2001
From: Alan Stokes <alanstokes@google.com>
Date: Mon, 16 Dec 2019 12:48:50 +0000
Subject: [PATCH 2/2] Run PackageManagerShellCommandTest in Treehugger.

Atest was showing a warning:

WARNING: PackageManagerShellCommandTest is not a valid build target
and may not be discoverable by TreeHugger. If you want to specify a
class or test-package, please set 'name' to the test module and use
'options' to specify the right tests via 'include-filter'.

This change fixes that warning; it may even allow the tests to be run
in Treehugger presubmit.

Test: atest PackageManagerShellCommandTest
Test: atest -b -p services/core/java/com/android/server/pm (tests build, no warning)
Change-Id: I6f507ec005fc2e946358e2d54ed4d255705c5e9b
---
 services/core/java/com/android/server/pm/TEST_MAPPING | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index d01ea9a50573b..59a58042011e5 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -24,7 +24,12 @@
       ]
     },
     {
-      "name": "PackageManagerShellCommandTest"
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "include-filter": "android.content.pm.cts.PackageManagerShellCommandTest"
+        }
+      ]
     },
     {
       "name": "GtsSecurityHostTestCases",