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

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

Merge "Update TEST_MAPPING to include CtsMediaAudioTestCases" am: b4083a32 

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

Change-Id: If8928df13252bea177dce78f5219c7f233272783
parents 15f4bff5 b4083a32

media/codec2/TEST_MAPPING

+13 −2
Original line number Original line Diff line number Diff line
@@ -9,6 +9,17 @@ 
  "presubmit-large": [

  "presubmit-large": [

    {

    {

      "name": "CtsMediaTestCases",

      "name": "CtsMediaTestCases",

      "options": [

        {

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

        },

        {

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

        }

      ]

    },

    {

      "name": "CtsMediaAudioTestCases",

      "options": [

      "options": [

        {

        {

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

          "include-annotation": "android.platform.test.annotations.Presubmit"
@@ -18,10 +29,10 @@ 
        },

        },

        // TODO: b/149314419

        // TODO: b/149314419

        {

        {

          "exclude-filter": "android.media.cts.AudioPlaybackCaptureTest"

          "exclude-filter": "android.media.audio.cts.AudioPlaybackCaptureTest"

        },

        },

        {

        {

          "exclude-filter": "android.media.cts.AudioRecordTest"

          "exclude-filter": "android.media.audio.cts.AudioRecordTest"

        }

        }

      ]

      ]

    }

    }

media/libstagefright/TEST_MAPPING

+13 −2
Original line number Original line Diff line number Diff line
@@ -14,6 +14,17 @@ 
  "presubmit-large": [

  "presubmit-large": [

    {

    {

      "name": "CtsMediaTestCases",

      "name": "CtsMediaTestCases",

      "options": [

        {

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

        },

        {

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

        }

      ]

    },

    {

      "name": "CtsMediaAudioTestCases",

      "options": [

      "options": [

        {

        {

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

          "include-annotation": "android.platform.test.annotations.Presubmit"
@@ -23,10 +34,10 @@ 
        },

        },

        // TODO: b/149314419

        // TODO: b/149314419

        {

        {

          "exclude-filter": "android.media.cts.AudioPlaybackCaptureTest"

          "exclude-filter": "android.media.audio.cts.AudioPlaybackCaptureTest"

        },

        },

        {

        {

          "exclude-filter": "android.media.cts.AudioRecordTest"

          "exclude-filter": "android.media.audio.cts.AudioRecordTest"

        }

        }

      ]

      ]

    }

    }