diff options
| author | 2023-07-24 12:25:55 -0700 | |
|---|---|---|
| committer | 2023-07-24 19:54:13 +0000 | |
| commit | b5f1f9e0c7089edb123c069050f3fed45bf07f29 (patch) | |
| tree | ab18298c7e2142106b2d93d8faf01c33f5dc63a4 | |
| parent | 5493a0023544bfca09a08c81b44c852e85c36030 (diff) | |
Only use apex test-groups in mainline-postsubmit
Recently, we modified our TEST_MAPPING files (the same TEST_MAPPING
files affected by this change).
One thing that was modified is that we placed
'*[com.google.android.permission.apex]'-named test modules inside the
'postsubmit' test-group. But, this breaks postsubmit. These should
be placed in the 'mainline-postsubmit' test-group.
Bug: 292483550
Test: cd packages/modules/Permission && atest :postsubmit --dry-run --include-subdirs
Change-Id: I63a28cf7d3bea342e28a66bb276869c40711da7a
5 files changed, 15 insertions, 5 deletions
diff --git a/PermissionController/TEST_MAPPING b/PermissionController/TEST_MAPPING index 902c49a50..869bb2020 100644 --- a/PermissionController/TEST_MAPPING +++ b/PermissionController/TEST_MAPPING @@ -97,7 +97,9 @@ }, { "name": "CtsPermissionUiTestCases" - }, + } + ], + "mainline-postsubmit": [ { "name": "CtsRoleTestCases[com.google.android.permission.apex]", "options": [ diff --git a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING index 3b2d793f8..cfeb58a94 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING @@ -109,7 +109,9 @@ "include-filter": "android.permission.cts.PlatformPermissionGroupMappingTest" } ] - }, + } + ], + "mainline-postsubmit": [ { "name": "CtsPermissionTestCases[com.google.android.permission.apex]", "options": [ diff --git a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING index 064ac5401..a95df2fd5 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING @@ -29,7 +29,9 @@ "postsubmit": [ { "name": "CtsRoleTestCases" - }, + } + ], + "mainline-postsubmit": [ { "name": "CtsRoleTestCases[com.google.android.permission.apex]", "options": [ diff --git a/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING index 5aeb3f015..23c1398da 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING @@ -40,7 +40,9 @@ }, { "name": "CtsPermissionUiTestCases" - }, + } + ], + "mainline-postsubmit": [ { "name": "CtsPermissionUiTestCases[com.google.android.permission.apex]" } diff --git a/service/java/com/android/role/TEST_MAPPING b/service/java/com/android/role/TEST_MAPPING index fac94b3ff..b3507f053 100644 --- a/service/java/com/android/role/TEST_MAPPING +++ b/service/java/com/android/role/TEST_MAPPING @@ -51,7 +51,9 @@ }, { "name": "CtsRoleTestCases" - }, + } + ], + "mainline-postsubmit": [ { "name": "CtsRoleTestCases[com.google.android.permission.apex]", "options": [ |