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

Commit 9163f1ba authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Update TEST_MAPPING to include broadcast response related tests." into tm-dev am: c5229086 

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



Change-Id: I62c1b74448ac3f657cd890a44b6abc3100f87e28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16c1f32b c5229086

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+12 −0
Original line number Diff line number Diff line
@@ -19,6 +19,18 @@ 
      ]

    }

  ],

  "presubmit-large": [

    {

      "name": "CtsUsageStatsTestCases",

      "options": [

        {"include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.MediumTest"},

        {"exclude-annotation": "androidx.test.filters.LargeTest"}

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "CtsUsageStatsTestCases"

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

+26 −0
Original line number Diff line number Diff line
@@ -63,6 +63,32 @@ 
      ]

    }

  ],

  "presubmit-large": [

    {

      "name": "CtsUsageStatsTestCases",

      "file_patterns": [

        "ActivityManagerService\\.java",

        "BroadcastQueue\\.java"

      ],

      "options": [

        {

          "include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"

        },

        {

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

        },

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "FrameworksServicesTests",

services/usage/java/com/android/server/usage/TEST_MAPPING

+22 −0
Original line number Diff line number Diff line
@@ -20,6 +20,28 @@ 
      ]

    }

  ],

  "presubmit-large": [

    {

      "name": "CtsUsageStatsTestCases",

      "options": [

        {

          "include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"

        },

        {

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

        },

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "CtsUsageStatsTestCases",