| commit | 89a491e2d493d6db72ba4e068883d467acac0af4 | [log] [tgz] |
|---|---|---|
| author | Xusong Wang <xusongw@google.com> | Fri Jan 22 23:03:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 22 23:03:27 2021 +0000 |
| tree | eeab0e9f30db6a39a0c1885bc9e68935ca8b5596 | |
| parent | 7deb270e39408b879ee0d8a0487bc63953479d79 [diff] | |
| parent | ab4c0acd8f563b5c276915e4d59c07f92a512501 [diff] |
Merge "Increase NNAPI VTS single-test timeout to 20m." am: eafa06164d am: 1523e7711b am: ab4c0acd8f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526466 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I511d553e4af82a38353c3e7076a0ae8a037ee10a
diff --git a/neuralnetworks/1.0/vts/functional/AndroidTest.xml b/neuralnetworks/1.0/vts/functional/AndroidTest.xml index 13671f9..9dd85ae 100644 --- a/neuralnetworks/1.0/vts/functional/AndroidTest.xml +++ b/neuralnetworks/1.0/vts/functional/AndroidTest.xml
@@ -28,5 +28,6 @@ <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="VtsHalNeuralnetworksV1_0TargetTest" /> + <option name="native-test-timeout" value="20m" /> </test> </configuration>
diff --git a/neuralnetworks/1.1/vts/functional/AndroidTest.xml b/neuralnetworks/1.1/vts/functional/AndroidTest.xml index cfde60c..74001f9 100644 --- a/neuralnetworks/1.1/vts/functional/AndroidTest.xml +++ b/neuralnetworks/1.1/vts/functional/AndroidTest.xml
@@ -28,5 +28,6 @@ <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="VtsHalNeuralnetworksV1_1TargetTest" /> + <option name="native-test-timeout" value="20m" /> </test> </configuration>