Merge "Add configs for new unit tests available in Android Pi" into pi-dev
am: efa8cd4fbc
Change-Id: I9beb07d88660977648d44ce9d38a9582b2516b3e
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-feature.xml b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-feature.xml
new file mode 100644
index 0000000..16f7cb6
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-feature.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+ <option name="test-tag" value="widevineCdmFeature" />
+ <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+ <option name="test-file-name" value="bin/cdm_feature_test" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.GTest">
+ <option name="native-test-device-path" value="/data/bin" />
+ <option name="module-name" value="cdm_feature_test" />
+ <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+ <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+ </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-crypto-session-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-crypto-session-unit.xml
new file mode 100644
index 0000000..c316f03
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-crypto-session-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+ <option name="test-tag" value="widevineCryptoSessionUnit" />
+ <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+ <option name="test-file-name" value="bin/crypto_session_unittest" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.GTest">
+ <option name="native-test-device-path" value="/data/bin" />
+ <option name="module-name" value="crypto_session_unittest" />
+ <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+ <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+ </test>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-wv-cdm-metrics.xml b/res/config/google/test/framework/media/widevine/tests/widevine-wv-cdm-metrics.xml
new file mode 100644
index 0000000..9b837c1
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-wv-cdm-metrics.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 Google Inc. All Rights Reserved -->
+<!-- Required options: branch build-flavor -->
+<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
+ <option name="test-tag" value="widevineWvCdmMetrics" />
+ <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+ <option name="test-file-name" value="bin/wv_cdm_metrics_test" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.GTest">
+ <option name="native-test-device-path" value="/data/bin" />
+ <option name="module-name" value="wv_cdm_metrics_test" />
+ <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+ <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+ </test>
+</configuration>