Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f31ec72 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "Point test mappings to new suites." into main

parents 7ee0d6a5 8cbd113a

core/java/android/content/om/TEST_MAPPING

+1 −6
Original line number Diff line number Diff line
@@ -18,12 +18,7 @@ 
      "name": "OverlayHostTests"

    },

    {

      "name": "CtsAppSecurityHostTestCases",

      "options": [

        {

          "include-filter": "android.appsecurity.cts.OverlayHostTest"

        }

      ]

      "name": "CtsOverlayHostTestCases"

    }

  ],

  "presubmit-large": [

core/java/android/content/pm/TEST_MAPPING

+17 −17
Original line number Diff line number Diff line
@@ -97,36 +97,42 @@ 
                    "include-filter":"android.incrementalinstall.cts.IncrementalFeatureTest"

                }

            ]

        }

    ],

    "presubmit-large":[

        },

        {

            "name":"CtsContentTestCases",

            "name":"CtsPackageManagerHostTestCases",

            "options":[

                {

                    "exclude-annotation":"androidx.test.filters.FlakyTest"

                    "include-annotation":"android.platform.test.annotations.Presubmit"

                },

                {

                    "exclude-annotation":"org.junit.Ignore"

                    "exclude-annotation":"android.platform.test.annotations.Postsubmit"

                },

                {

                    "include-filter":"android.content.pm.cts"

                    "exclude-annotation":"androidx.test.filters.FlakyTest"

                },

                {

                    "exclude-annotation":"org.junit.Ignore"

                }

            ]

        },

        }

    ],

    "presubmit-large":[

        {

            "name":"CtsUsesNativeLibraryTest",

            "name":"CtsContentTestCases",

            "options":[

                {

                    "exclude-annotation":"androidx.test.filters.FlakyTest"

                },

                {

                    "exclude-annotation":"org.junit.Ignore"

                },

                {

                    "include-filter":"android.content.pm.cts"

                }

            ]

        },

        {

            "name":"CtsSuspendAppsPermissionTestCases",

            "name":"CtsUsesNativeLibraryTest",

            "options":[

                {

                    "exclude-annotation":"androidx.test.filters.FlakyTest"
@@ -137,14 +143,8 @@ 
            ]

        },

        {

            "name":"CtsAppSecurityHostTestCases",

            "name":"CtsSuspendAppsPermissionTestCases",

            "options":[

                {

                    "include-annotation":"android.platform.test.annotations.Presubmit"

                },

                {

                    "exclude-annotation":"android.platform.test.annotations.Postsubmit"

                },

                {

                    "exclude-annotation":"androidx.test.filters.FlakyTest"

                },

core/java/android/provider/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
            "name": "SettingsProviderTest"

        },

        {

            "name": "CtsAppSecurityHostTestCases",

            "name": "CtsPackageManagerHostTestCases",

            "options": [

                {

                    "include-filter": "android.appsecurity.cts.ReadableSettingsFieldsTest"

core/java/com/android/internal/security/TEST_MAPPING

+1 −6
Original line number Diff line number Diff line
@@ -20,12 +20,7 @@ 
      "file_patterns": ["VerityUtils\\.java"]

    },

    {

      "name": "CtsAppSecurityHostTestCases",

      "options": [

        {

          "include-filter": "android.appsecurity.cts.ApkVerityInstallTest"

        }

      ],

      "name": "CtsApkVerityInstallHostTestCases",

      "file_patterns": ["VerityUtils\\.java"]

    }

  ]

services/core/java/com/android/server/am/TEST_MAPPING

+1 −6
Original line number Diff line number Diff line
@@ -145,12 +145,7 @@ 
      ]

    },

    {

      "name": "CtsAppSecurityHostTestCases",

      "options": [

        {

          "include-filter": "android.appsecurity.cts.AppDataIsolationTests"

        }

      ]

      "name": "CtsAppDataIsolationHostTestCases"

    },

    {

      "name": "CtsAppTestCases",