commit 492baa6a3ba2944acd9304b6803562837800c69b
author Kyle Alexander <kylealexander@google.com> Tue Apr 10 17:10:23 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 10 17:10:23 2018 -0700
tree 13c6ad4a9feeabd8b9bc8cacf02d466920c265f2
parent cae0672d96591af5d76af3ccb1c58055af380005
parent c196ba00a970f577a4bca91ce610e9ad6679d92c

Merge "Update test timeout for OEMCrypto unit tests" into pi-dev
am: c196ba00a9

Change-Id: I4b652e1eac48e8f2dbf9c77d6eb47f21fc3ce458

res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml

diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml b/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml
index 73e5f76..748f4bc 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml
@@ -12,6 +12,9 @@
         <option name="negative-testname-filter" value="OEMCryptoKeyboxTest.GetKeyDataNullPointer" />
         <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" />
+        <!-- native-test-timeout unit is ms, value = 10 min -->
+        <!-- updated for UsageTableTest:TwoHundredEntries which takes around 4 minutes -->
+        <option name="native-test-timeout" value="600000" />
     </test>
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />