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

Commit 40198661 authored by Jeff Chen's avatar Jeff Chen
Browse files

Make staged config only have one include-annotation. Because it's intersection not union. 

Bug: 309159722
Test: presubmit
Flag: None
Change-Id: I7f087de2e114728ad6ade0809257deef9d38a41b
parent 512cf072

packages/SystemUI/TEST_MAPPING

+3 −33
Original line number Diff line number Diff line
@@ -88,20 +88,6 @@ 
          "include-filter": "android.permissionui.cts.CameraMicIndicatorsPermissionTest"

        }

      ]

    },

    {

      "name": "SystemUIGoogleScreenshotTests",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],
@@ -171,12 +157,6 @@ 
        },

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    },
@@ -188,28 +168,18 @@ 
        },

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    },

    {      "name": "SystemUIGoogleBiometricsScreenshotTests",

    {

      // TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)

      "name": "SystemUIGoogleBiometricsScreenshotTests",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }