From 6f0a63014600b5681159a23b3d86ae5419c23e50 Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Fri, 11 Sep 2020 20:48:02 -0700 Subject: [PATCH] Replace testWidevine23FpsH264Fixed with a shorter test. Select WidevineYouTubePerformanceTests#testL3Cenc480P30 so the test does not exceed one minute during presubmit testing. Requires adding @Presubmit annotation to testL3Cenc480P30. This is because some existing tests that use @Presubmit annotation take precedent over the rest of the tests in TEST_MAPPING file. If we do not use @Presubmit annotation, the new test will not be executed. Using @Presubmit annotation has the advantage of not having to explicitly specify testL3Cenc480P30, in the include-filter. Test: atest --test-mapping [directory with TEST_MAPPING] e.g. from frameworks/av, run "atest --test-mapping drm Bug: 168159824 Change-Id: Ibd9d6df61b8f637b4e4cb1810ae5b595dce717ad --- media/TEST_MAPPING | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/media/TEST_MAPPING b/media/TEST_MAPPING index 6dc0c6f5b6767..cf2f0f0da2b7b 100644 --- a/media/TEST_MAPPING +++ b/media/TEST_MAPPING @@ -4,21 +4,13 @@ "name": "GtsMediaTestCases", "options" : [ { - "include-annotation": "android.platform.test.annotations.Presubmit" + "include-annotation": "android.platform.test.annotations.Presubmit" }, { "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests" - } - ] - }, - { - "name": "GtsExoPlayerTestCases", - "options" : [ - { - "include-annotation": "android.platform.test.annotations.SocPresubmit" }, { - "include-filter": "com.google.android.exoplayer.gts.DashTest#testWidevine23FpsH264Fixed" + "include-filter": "com.google.android.media.gts.WidevineYouTubePerformanceTests" } ] }