commit 0e1004931bc52f31cc0dc37ceb54689751faf3f0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 16 22:59:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 16 22:59:38 2020 +0000
tree 60b0ba4df792936c97ccf7ec347143d460d7170d
parent ccef64580c76f8a58505cb6f4fb713e4a37f8d7d
parent 3faecf1a4a59f16cdf575ad9a52a160641994596

Merge "Increase NNAPI VTS single-test timeout to 20m." into android11-tests-dev

neuralnetworks/1.2/vts/functional/AndroidTest.xml

diff --git a/neuralnetworks/1.2/vts/functional/AndroidTest.xml b/neuralnetworks/1.2/vts/functional/AndroidTest.xml
index 3f91618..5396d85 100644
--- a/neuralnetworks/1.2/vts/functional/AndroidTest.xml
+++ b/neuralnetworks/1.2/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_2TargetTest" />
+        <option name="native-test-timeout" value="20m" />
     </test>
 </configuration>

neuralnetworks/1.3/vts/functional/AndroidTest.xml

diff --git a/neuralnetworks/1.3/vts/functional/AndroidTest.xml b/neuralnetworks/1.3/vts/functional/AndroidTest.xml
index e5acd90..c418aaa 100644
--- a/neuralnetworks/1.3/vts/functional/AndroidTest.xml
+++ b/neuralnetworks/1.3/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_3TargetTest" />
+        <option name="native-test-timeout" value="20m" />
     </test>
 </configuration>