summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ronald Braunstein <rbraunstein@google.com> 2024-04-08 17:32:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-08 17:32:24 +0000
commit5b82eb1939145a43a2ec3ced831bac6f4890ab92 (patch)
tree3ac1f9a9de848b6cc4d0ceb2112422ee8be2def5
parent790796bea95ac527c2e45dfe1026644081921cdb (diff)
parent129bf1e2150151026bc49a6c6d042ea7e64a8dcf (diff)
Migrating test options From TEST_MAPPING -> Android.bp am: 129bf1e215
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3028665 Change-Id: If1700327636fa24224a2cf5f982a95fefd3c2717 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING4
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING4
-rw-r--r--TEST_MAPPING6
3 files changed, 14 insertions, 0 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING
index 5dea9615a..487701204 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING
@@ -72,6 +72,10 @@
],
"postsubmit": [
{
+ // TODO(b/332974906): Replace in presubmit-large.
+ "name": "CtsDevicePolicyManagerTestCases_Permissions_NoFlakes"
+ },
+ {
"name": "CtsPermissionTestCases",
"options": [
{
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING
index 2a4953f51..d0b115bcb 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING
@@ -30,6 +30,10 @@
"name": "CtsPermissionUiTestCases"
},
{
+ // TODO(b/332974906): Promote in presubmit-large.
+ "name": "CtsDevicePolicyManagerTestCases_Permissions_NoFlakes"
+ },
+ {
"name": "CtsPermissionTestCases",
"options": [
{
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 689cd6865..e1bfdde7c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -68,5 +68,11 @@
}
]
}
+ ],
+ "postsubmit" : [
+ {
+ // TODO(b/332974906): Replace in alltests.
+ "name" : "CtsDevicePolicyManagerTestCases_Permissions"
+ }
]
}