commit 74a3fa387251979e2fc0d4908bc10f9fd3a89d03
author Zhuoyao Zhang <zhuoyao@google.com> Fri Oct 06 22:43:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 06 22:43:26 2017 +0000
tree 289222077912d9907ace2e08ebe45b3319894c9e
parent f2e8dff51a78ebfa451dc27f672ab521e55eab94
parent 893c89fd3cea38175d974a9324af5471fb3d16b3

Merge "Configure timeout for fmqUnitTest" am: 5270385240 am: 2c9034cc78
am: 893c89fd3c

Change-Id: I7d87c12579585370da837dff0bf64e316cfd5097

tests/AndroidTest.xml

diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 877fb7b..f861a10 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -35,5 +35,6 @@
         <option name="binary-test-envp" value="VTS_ROOT_PATH=/data/local/tmp" />
         <option name="binary-test-args" value="-x /data/local/tmp/system/lib" />
         <option name="binary-test-args" value="-y /data/local/tmp/system/lib64" />
+        <option name="test-timeout" value="1m"/>
     </test>
 </configuration>