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

Commit a79341e0 authored by Patrick Baumann's avatar Patrick Baumann Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b/262254794" into tm-dev 

* changes:
  Cleanup after test suite split.
  Moving PackageManagerServiceTests to their own suite.
parents c08a545a b7833028

TEST_MAPPING

+30 −0
Original line number Diff line number Diff line
@@ -15,6 +15,22 @@ 
      ]

    }

  ],

  "presubmit-pm": [

    {

      "name": "PackageManagerServiceServerTests",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "presubmit": [

    {

      "name": "ManagedProvisioningTests",
@@ -167,6 +183,20 @@ 
         "exclude-annotation": "org.junit.Ignore"

       }

     ]

   },

   {

     "name": "PackageManagerServiceServerTests",

     "options": [

       {

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

       },

       {

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

       },

       {

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

       }

     ]

   }

 ]

}

services/tests/PackageManagerServiceTests/TEST_MAPPING

+34 −0
Original line number Diff line number Diff line
@@ -2,11 +2,45 @@ 
  "presubmit": [

    {

      "name": "AppEnumerationInternalTests"

    },

    {

      "name": "PackageManagerServiceServerTests",

      "options": [

        {

          "include-filter": "com.android.server.pm."

        },

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "PackageManagerServiceHostTests"

    },

    {

      "name": "PackageManagerServiceServerTests",

      "options": [

        {

          "include-filter": "com.android.server.pm."

        },

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "imports": [