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

Commit 6f71f8a6 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Add TEST_MAPPING for displayservicetests" into udc-qpr-dev am: c5c66d40 

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



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

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

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

    "presubmit": [

        {

            "name": "FrameworksMockingServicesTests",

            "options": [

                {"include-filter": "com.android.server.display"},

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

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

            ]

        },

        {

            "name": "FrameworksServicesTests",

            "name": "DisplayServiceTests",

            "options": [

                {"include-filter": "com.android.server.display"},

                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
@@ -31,5 +23,14 @@ 
                }

            ]

        }

    ],

    "postsubmit": [

        {

            "name": "DisplayServiceTests",

            "options": [

                {"include-filter": "com.android.server.display"},

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

            ]

        }

    ]

}

services/tests/displayservicetests/TEST_MAPPING

+2 −8
Original line number Diff line number Diff line 
{

  "presubmit": [

  "imports": [

    {

      "name": "DisplayServiceTests",

      "options": [

        {"include-filter": "com.android.server.display"},

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

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

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

      ]

      "path": "frameworks/base/services/core/java/com/android/server/display"

    }

  ]

}