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

Commit 3df941d5 authored by Hui Yu's avatar Hui Yu Committed by Android (Google) Code Review
Browse files

Merge "Add presubmit tests to gate ActivityManager and OomAdjuster changes." into udc-dev

parents 67682216 c3cda8b1

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

+17 −4
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
    {

      "name": "CtsAppTestCases",

      "options": [

        {

          "include-filter": "android.app.cts.TaskDescriptionTest"

        },

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

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

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

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

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

        {

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

        },
@@ -14,7 +16,8 @@ 
        },

        {

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

        }

        },

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

      ]

    },

    {
@@ -148,6 +151,16 @@ 
          "include-filter": "android.appsecurity.cts.AppDataIsolationTests"

        }

      ]

    },

    {

      "name": "CtsAppTestCases",

      "options": [

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

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

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

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

        { "include-filter": "android.app.cts.ActivityManagerFgsBgStartTest" }

      ]

    }

  ]

}