diff options
| author | Kyle Alexander <kylealexander@google.com> | 2018-04-12 13:28:12 -0700 |
|---|---|---|
| committer | Kyle Alexander <kylealexander@google.com> | 2018-04-12 14:51:20 -0700 |
| commit | cf0edc99aca0fb7e5d6e53d5aef923f1f48f7284 (patch) | |
| tree | 624d74ce5f5e6adf0584ad009c7cdccf75117e95 /res | |
| parent | 62646ef3de693a750f6d6d33433c73e414c4016e (diff) | |
| download | contrib-cf0edc99aca0fb7e5d6e53d5aef923f1f48f7284.tar.gz | |
Migrate hosting gts-media to our own x20 directory
This unblocks the usage of a new GtsMediaTestCases package that
contain fixes for several Pi defects.
Test: tradefed.sh run google/template/asit --template:map test google/test/framework/media/gts-media
Bug: 71637279
Bug: 35039717
Bug: 74196996
Change-Id: Ib57c86736d10af74660f4ef6b527a3e8f167ad02
Diffstat (limited to 'res')
| -rw-r--r-- | res/config/google/test/framework/media/gts-media.xml | 172 |
1 files changed, 7 insertions, 165 deletions
diff --git a/res/config/google/test/framework/media/gts-media.xml b/res/config/google/test/framework/media/gts-media.xml index ac81a99..a22d993 100644 --- a/res/config/google/test/framework/media/gts-media.xml +++ b/res/config/google/test/framework/media/gts-media.xml @@ -16,176 +16,18 @@ </target_preparer> <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup"> - <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/GtsMediaTestCases-nyc.apk" /> + <option name="apk-path" value="/google/data/ro/teams/widevine-tradefed/gts-apks/GtsMediaTestCases.apk" /> </target_preparer> - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.DecoderMetricsTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.DrmSessionManagerTest" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.MediaCodecCencTest" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.MediaCodecStressTest" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.MediaCodecTest" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.MediaDrmTest" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.MediaPlayerTest" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.RtcVideoCodecTest" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineCodecStressTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineDashPolicyTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineFailureTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineGenericOpsTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineH264PlaybackTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineHEVCPlaybackTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineHLSPlaybackTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> - - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineVP9WebMPlaybackTests" /> - <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> - <option name="shell-timeout" value="2000000" /> - <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> - </test> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="push" value="/google/data/ro/teams/widevine-tradefed/gts-apks/GtsMediaTestCases.dynamic->/sdcard/dynamic-config-files/GtsMediaTestCases.dynamic" /> + <option name="cleanup" value="true" /> + </target_preparer> - <test class="com.android.tradefed.testtype.InstrumentationTest"> - <option name="class" value="com.google.android.media.gts.WidevineYouTubePerformanceTests" /> + <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.google.android.media.gts" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="run-name" value="xts_media_test" /> + <option name="runtime-hint" value="2h" /> <option name="shell-timeout" value="2000000" /> <option name="test-timeout" value="600000" /> - <option name="bugreport-on-failure" value="EACH" /> </test> </configuration> |