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

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

Merge "Update TEST_MAPPING to include CtsMediaCodecTestCases" am: 4e9f40e7... 

Merge "Update TEST_MAPPING to include CtsMediaCodecTestCases" am: 4e9f40e7 am: 6efa76f5 am: f2253faa

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1944245

Change-Id: Ie6d8da35dd729742254fc92267e8e509bb3f6f9d
parents 48588698 f2253faa

media/TEST_MAPPING

+8 −8
Original line number Diff line number Diff line
@@ -3,18 +3,18 @@ 
    "presubmit-large": [

        // runs whenever we change something in this tree

        {

            "name": "CtsMediaTestCases",

            "name": "CtsMediaCodecTestCases",

            "options": [

                {

                    "include-filter": "android.media.cts.EncodeDecodeTest"

                    "include-filter": "android.media.codec.cts.EncodeDecodeTest"

                }

            ]

        },

        {

            "name": "CtsMediaTestCases",

            "name": "CtsMediaCodecTestCases",

            "options": [

                {

                    "include-filter": "android.media.cts.DecodeEditEncodeTest"

                    "include-filter": "android.media.codec.cts.DecodeEditEncodeTest"

                }

            ]

        }
@@ -46,18 +46,18 @@ 
        // runs regularly, independent of changes in this tree.

        // signals if changes elsewhere break media functionality

        {

            "name": "CtsMediaTestCases",

            "name": "CtsMediaCodecTestCases",

            "options": [

                {

                    "include-filter": "android.media.cts.EncodeDecodeTest"

                    "include-filter": "android.media.codec.cts.EncodeDecodeTest"

                }

            ]

        },

        {

            "name": "CtsMediaTestCases",

            "name": "CtsMediaCodecTestCases",

            "options": [

                {

                    "include-filter": "android.media.cts.DecodeEditEncodeTest"

                    "include-filter": "android.media.codec.cts.DecodeEditEncodeTest"

                }

            ]

        }

media/codec2/TEST_MAPPING

+11 −0
Original line number Diff line number Diff line
@@ -58,6 +58,17 @@ 
        }

      ]

    },

    {

      "name": "CtsMediaCodecTestCases",

      "options": [

        {

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

        },

        {

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

        }

      ]

    },

    {

      "name": "CtsMediaPlayerTestCases",

      "options": [

media/libstagefright/TEST_MAPPING

+11 −0
Original line number Diff line number Diff line
@@ -63,6 +63,17 @@ 
        }

      ]

    },

    {

      "name": "CtsMediaCodecTestCases",

      "options": [

        {

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

        },

        {

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

        }

      ]

    },

    {

      "name": "CtsMediaPlayerTestCases",

      "options": [