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

Commit e9712ca9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exclude large tests from presubmit." am: 3d8681e3 am: 9dc9fd89 am:... 

Merge "Exclude large tests from presubmit." am: 3d8681e3 am: 9dc9fd89 am: 5860c207 am: da40df7c

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



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

core/java/android/app/TEST_MAPPING

+3 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,9 @@ 
                {

                {

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

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

                },

                },

                {

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

                },

                {

                {

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

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

                },

                },

core/java/android/content/TEST_MAPPING

+3 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,9 @@ 
        {

        {

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

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

        },

        },

        {

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

        },

        {

        {

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

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

        },

        },

core/java/android/view/TEST_MAPPING

+3 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,9 @@ 
        {

        {

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

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

        },

        },

        {

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

        },

        {

        {

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

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

        },

        },