Merge "Update gts-media.xml to include missing gts.media tests"
diff --git a/res/config/google/test/framework/media/gts-media.xml b/res/config/google/test/framework/media/gts-media.xml
index a311ed9..3a6e4aa 100644
--- a/res/config/google/test/framework/media/gts-media.xml
+++ b/res/config/google/test/framework/media/gts-media.xml
@@ -10,6 +10,26 @@
</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" />
@@ -20,6 +40,16 @@
</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" />
@@ -50,6 +80,26 @@
</test>
<test class="com.android.tradefed.testtype.InstrumentationTest">
+ <option name="class" value="com.google.android.media.gts.Vp8CodecTest" />
+ <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" />