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

Commit aa5e39fd authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Updates more CtsContentTestCases to TEST_MAPPING"

parents 55109cc7 096b5ee6

core/java/android/content/om/TEST_MAPPING

+14 −0
Original line number Diff line number Diff line
@@ -21,6 +21,20 @@ 
          "include-filter": "android.appsecurity.cts.OverlayHostTest"

        }

      ]

    },

    {

      "name": "CtsContentTestCases",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ]

}

core/java/android/content/pm/TEST_MAPPING

+14 −0
Original line number Diff line number Diff line
@@ -17,6 +17,20 @@ 
    },

    {

      "name": "CarrierAppIntegrationTestCases"

    },

    {

      "name": "CtsContentTestCases",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

core/java/android/content/res/TEST_MAPPING

+14 −0
Original line number Diff line number Diff line
@@ -2,6 +2,20 @@ 
  "presubmit": [

    {

      "name": "CtsResourcesLoaderTests"

    },

    {

      "name": "CtsContentTestCases",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ]

}

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

+3 −6
Original line number Diff line number Diff line
@@ -33,16 +33,13 @@ 
      "name": "CtsContentTestCases",

      "options": [

        {

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

        },

        {

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

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

        },

        {

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

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

        },

        {

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

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

        }

      ]

    },