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

Commit 71c49c1a authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Android (Google) Code Review
Browse files

Merge "Revert "[MediaProjection] Test mapping runs CTS""

parents 21896f7e 846ed999

media/java/android/media/projection/TEST_MAPPING

+0 −14
Original line number Original line Diff line number Diff line
@@ -13,20 +13,6 @@ 
          "exclude-annotation": "org.junit.Ignore"

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

        }

        }

      ]

      ]

    },

    {

      "name": "CtsMediaProjectionTestCases",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

    }

  ]

  ]

}
 
}

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

+1 −17
Original line number Original line Diff line number Diff line
@@ -54,23 +54,7 @@ 
        },

        },

        {

        {

            "name": "BinaryTransparencyHostTest",

            "name": "BinaryTransparencyHostTest",

            "file_patterns": [

            "file_patterns": ["BinaryTransparencyService\\.java"]

                "BinaryTransparencyService\\.java"

            ]

        },

        {

            "name": "CtsMediaProjectionTestCases",

            "options": [

                {

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

                },

                {

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

                },

                {

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

                }

            ]

        }

        }

    ],

    ],

    "presubmit-large": [

    "presubmit-large": [

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

+0 −14
Original line number Original line Diff line number Diff line
@@ -16,20 +16,6 @@ 
                {"exclude-annotation": "androidx.test.filters.FlakyTest"},

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

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

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

            ]

            ]

        },

        {

            "name": "CtsMediaProjectionTestCases",

            "options": [

                {

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

                },

                {

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

                },

                {

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

                }

            ]

        }

        }

    ]

    ]

}
 
}
 
 No newline at end of file

services/core/java/com/android/server/media/projection/TEST_MAPPING

+0 −14
Original line number Original line Diff line number Diff line
@@ -13,20 +13,6 @@ 
          "exclude-annotation": "org.junit.Ignore"

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

        }

        }

      ]

      ]

    },

    {

      "name": "CtsMediaProjectionTestCases",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    }

    }

  ]

  ]

}
 
}