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

Commit 5976fc19 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[pm] Move CtsContentTestCases to postsubmit for pm changes" into udc-dev am: bc366209 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24356854



Change-Id: Id6bdfe7f7c4a38277f2659c314295b91fa232db3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 921bdc36 bc366209

core/java/android/content/pm/TEST_MAPPING

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

    ],

    "presubmit-large":[

        {

            "name":"CtsContentTestCases",

            "options":[

                {

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

                },

                {

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

                },

                {

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

                }

            ]

        },

        {

            "name":"CtsUsesNativeLibraryTest",

            "options":[
@@ -155,6 +141,20 @@ 
        }

    ],

    "postsubmit":[

        {

            "name":"CtsContentTestCases",

            "options":[

                {

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

                },

                {

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

                },

                {

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

                }

            ]

        },

        {

            "name":"CtsAppSecurityHostTestCases",

            "options":[

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

+2 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
      ]

    }

  ],

  "presubmit-large": [

  "postsubmit": [

    {

      "name": "CtsContentTestCases",

      "options": [
@@ -104,9 +104,7 @@ 
          "include-filter": "android.content.pm.cts"

        }

      ]

    }

  ],

  "postsubmit": [

    },

    {

      "name": "CtsPermissionTestCases",

      "options": [