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

Commit ec77bf2d authored by Ray Essick's avatar Ray Essick
Browse files

Revert "Update TEST_MAPPING to include CtsMediaMiscTestCases" 

Revert "CtsMedia: Rename CtsMediaTestCases as CtsMediaMiscTestCases"

Revert submission 1978570-cts-media-misc-reorg

Reason for revert:merge conflict in stage-aosp-master
Bug: 215230968
Bug: 220197952
Reverted Changes:
I4e6f88920:Update TEST_MAPPING to include CtsMediaMiscTestCas...
Id57f3d675:CtsMedia: Rename CtsMediaTestCases as CtsMediaMisc...

Change-Id: I6301ec32373a201174ac5b65cca428fa652a99c4
parent 5a27989d

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"

          }

      ]

    }