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

Commit bec23517 authored by Ronald Braunstein's avatar Ronald Braunstein Committed by Automerger Merge Worker
Browse files

Merge "Migrate TestMapping options to Android.bp Presubmit" into main am: f9c1047e 

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



Change-Id: I6d3ac931cfa849da40c3bbc56b1f2e09cac2b547
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1f3432d f9c1047e

services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING

+0 −17
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      // b/331020193, Move to presubmit early april 2024

      "name": "FrameworksServicesTests_contentcapture"

    }

  ]

services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING

+0 −17
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      // b/331020193, Move to presubmit early april 2024

      "name": "FrameworksServicesTests_contentprotection"

    }

  ]

services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING

+1 −19
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

          "include-filter": "com.android.server.location.contexthub."

        },

        {

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

        },

        {

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

        },

        {

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

        }

      ]

      "name": "FrameworksServicesTests_contexthub_presubmit"

    }

  ],

  "postsubmit": [

    {

      // b/331020193, Move to presubmit early april 2024

      "name": "FrameworksServicesTests_contexthub_presubmit"

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

services/tests/servicestests/src/com/android/server/om/TEST_MAPPING

+1 −12
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        }

      ]

      "name": "FrameworksServicesTests_om"

    },

    {

      "name": "PackageManagerServiceHostTests",
@@ -16,11 +11,5 @@ 
        }

      ]

    }

  ],

  "postsubmit": [

    {

      // b/331020193, Move to presubmit early april 2024

      "name": "FrameworksServicesTests_om"

    }

  ]

}

services/tests/servicestests/src/com/android/server/os/TEST_MAPPING

+0 −11
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      // b/331020193, Move to presubmit early april 2024

      "name": "FrameworksServicesTests_os"

    }

  ]