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

Commit c2f68e31 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "Revert "Update TEST_MAPPING to include CtsMediaMiscTestCases"" am:... 

Merge "Revert "Update TEST_MAPPING to include CtsMediaMiscTestCases"" am: 8671e3fa am: 2bf58ed8 am: 923a66e8 am: 170a60fa

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

Change-Id: I30b4b08a752a793b72c3e002f606bed24d255ebd
parents d31e76b7 170a60fa

media/codec2/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  ],

  "presubmit-large": [

    {

      "name": "CtsMediaMiscTestCases",

      "name": "CtsMediaTestCases",

      "options": [

        {

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

media/libstagefright/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


  "presubmit-large": [

    {

      "name": "CtsMediaMiscTestCases",

      "name": "CtsMediaTestCases",

      "options": [

        {

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

media/libstagefright/id3/TEST_MAPPING

+3 −4
Original line number Diff line number Diff line
@@ -9,15 +9,14 @@ 


  "presubmit-large": [

    // this doesn't seem to run any tests.

    // but: cts-tradefed run -m CtsMediaMiscTestCases -t \

    // android.media.misc.cts.MediaMetadataRetrieverTest

    // but: cts-tradefed run -m CtsMediaTestCases -t android.media.cts.MediaMetadataRetrieverTest

    // does run he 32 and 64 bit tests, but not the instant tests

    // but all I know is that with 'atest', it's not running

    {

      "name": "CtsMediaMiscTestCases",

      "name": "CtsMediaTestCases",

      "options": [

          {

            "include-filter": "android.media.misc.cts.MediaMetadataRetrieverTest"

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

          }

      ]

    }