diff options
| author | Dan Shi <dshi@google.com> | 2019-10-05 03:36:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-05 03:36:43 +0000 |
| commit | e27c67047eadb425b9a4b17d60a6a7b83691598f (patch) | |
| tree | 8f39a914d2706ce070af7aed29828ac3432d2197 | |
| parent | ef6b15ab2d138e2f54f380e3e6faa2c959cc3969 (diff) | |
| parent | c3a7effa7fd07368eaf07be4da482d57d425f471 (diff) | |
| download | platform_packages_apps_PackageInstaller-ndk-sysroot-r21.tar.gz platform_packages_apps_PackageInstaller-ndk-sysroot-r21.tar.bz2 platform_packages_apps_PackageInstaller-ndk-sysroot-r21.zip | |
Merge changes Idccade48,I3213bc92ndk-sysroot-r21
* changes:
Move CtsDevicePolicyManagerTestCases to its own group
Sync TEST_MAPPING files from master branch
| -rw-r--r-- | src/com/android/packageinstaller/permission/service/TEST_MAPPING | 33 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/TEST_MAPPING | 37 |
2 files changed, 22 insertions, 48 deletions
diff --git a/src/com/android/packageinstaller/permission/service/TEST_MAPPING b/src/com/android/packageinstaller/permission/service/TEST_MAPPING index 3de5d730a..8790a5a61 100644 --- a/src/com/android/packageinstaller/permission/service/TEST_MAPPING +++ b/src/com/android/packageinstaller/permission/service/TEST_MAPPING @@ -23,38 +23,25 @@ ] } ], - "postsubmit": [ + "presubmit-devicepolicy": [ { - "name": "CtsPermissionTestCases", + "name": "CtsDevicePolicyManagerTestCases", "options": [ { - "include-filter": "android.permission.cts.LocationAccessCheckTest" + "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest" }, { - "exclude-annotation": "androidx.test.filters.FlakyTest" + "exclude-annotation": "android.platform.test.annotations.FlakyTest" } ] - }, + } + ], + "postsubmit": [ { - "name": "CtsDevicePolicyManagerTestCases", + "name": "CtsPermissionTestCases", "options": [ { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrant" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionPolicy" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionMixedPolicies" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionAppUpdate" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantPreMApp" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTestApi25#testPermissionGrantPreMApp" + "include-filter": "android.permission.cts.LocationAccessCheckTest" }, { "exclude-annotation": "androidx.test.filters.FlakyTest" @@ -62,4 +49,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/src/com/android/packageinstaller/permission/ui/TEST_MAPPING b/src/com/android/packageinstaller/permission/ui/TEST_MAPPING index 4ab861f02..b7fcffb75 100644 --- a/src/com/android/packageinstaller/permission/ui/TEST_MAPPING +++ b/src/com/android/packageinstaller/permission/ui/TEST_MAPPING @@ -1,38 +1,25 @@ { - "postsubmit": [ + "presubmit-devicepolicy": [ { - "name": "CtsAppSecurityHostTestCases", + "name": "CtsDevicePolicyManagerTestCases", "options": [ { - "include-filter": "android.appsecurity.cts.PermissionsHostTest" + "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest" + }, + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" } ] - }, + } + ], + "postsubmit": [ { - "name": "CtsDevicePolicyManagerTestCases", + "name": "CtsAppSecurityHostTestCases", "options": [ { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantOfDisallowedPermissionWhileOtherPermIsGranted" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrant" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionPolicy" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionMixedPolicies" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionAppUpdate" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantPreMApp" - }, - { - "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTestApi25#testPermissionGrantPreMApp" + "include-filter": "android.appsecurity.cts.PermissionsHostTest" } ] } ] -}
\ No newline at end of file +} |