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

Commit 6d2685fe authored by Julien Desprez's avatar Julien Desprez Committed by Automerger Merge Worker
Browse files

Merge "deduplicate CtsAppSearchHostTestCases from presubmit-large & presubmit"... 

Merge "deduplicate CtsAppSearchHostTestCases from presubmit-large & presubmit" into udc-dev am: 1090db2e

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



Change-Id: Idd4866754b06cb45191532832f875a78e08033b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73ba53d8 1090db2e

core/java/android/content/pm/TEST_MAPPING

+9 −33
Original line number Original line Diff line number Diff line
@@ -27,6 +27,9 @@ 
    {

    {

      "path": "cts/hostsidetests/os/test_mappings/packagemanager"

      "path": "cts/hostsidetests/os/test_mappings/packagemanager"

    },

    },

    {

      "path": "cts/hostsidetests/appsearch"

    },

    {

    {

      "path": "system/apex/tests"

      "path": "system/apex/tests"

    },

    },
@@ -45,6 +48,12 @@ 
    {

    {

      "name": "ApkVerityTest"

      "name": "ApkVerityTest"

    },

    },

    {

      "name": "CtsSilentUpdateHostTestCases"

    },

    {

      "name": "CtsSuspendAppsTestCases"

    },

    {

    {

      "name": "CtsAppFgsTestCases",

      "name": "CtsAppFgsTestCases",

      "file_patterns": ["(/|^)ServiceInfo[^/]*"],

      "file_patterns": ["(/|^)ServiceInfo[^/]*"],
@@ -110,39 +119,6 @@ 
        }

        }

      ]

      ]

    },

    },

    {

      "name": "CtsAppSearchHostTestCases",

      "options": [

        {

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

        },

        {

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

        }

      ]

    },

    {

      "name": "CtsSilentUpdateHostTestCases",

      "options": [

        {

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

        },

        {

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

        }

      ]

    },

    {

      "name": "CtsSuspendAppsTestCases",

      "options": [

        {

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

        },

        {

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

        }

      ]

    },

    {

    {

      "name": "CtsSuspendAppsPermissionTestCases",

      "name": "CtsSuspendAppsPermissionTestCases",

      "options": [

      "options": [