Merge "Increase test timeouts." into oc-dev
diff --git a/bluetooth/V1_0/target/AndroidTest.xml b/bluetooth/V1_0/target/AndroidTest.xml
index b18923b..dd10adc 100644
--- a/bluetooth/V1_0/target/AndroidTest.xml
+++ b/bluetooth/V1_0/target/AndroidTest.xml
@@ -26,6 +26,6 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="precondition-lshal" value="android.hardware.bluetooth@1.0"/>
- <option name="test-timeout" value="3m"/>
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/bluetooth/V1_0/target_profiling/AndroidTest.xml b/bluetooth/V1_0/target_profiling/AndroidTest.xml
index 0290cda..24a5972 100644
--- a/bluetooth/V1_0/target_profiling/AndroidTest.xml
+++ b/bluetooth/V1_0/target_profiling/AndroidTest.xml
@@ -30,6 +30,6 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="enable-profiling" value="true"/>
<option name="precondition-lshal" value="android.hardware.bluetooth@1.0"/>
- <option name="test-timeout" value="3m"/>
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/ir/V1_0/target/AndroidTest.xml b/ir/V1_0/target/AndroidTest.xml
index 9eeea6e..da5d53a 100644
--- a/ir/V1_0/target/AndroidTest.xml
+++ b/ir/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.ir@1.0"/>
- <option name="test-timeout" value="1m"/>
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/ir/V1_0/target_profiling/AndroidTest.xml b/ir/V1_0/target_profiling/AndroidTest.xml
index 180d4f3..07a2392 100644
--- a/ir/V1_0/target_profiling/AndroidTest.xml
+++ b/ir/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="enable-profiling" value="true"/>
<option name="precondition-lshal" value="android.hardware.ir@1.0"/>
- <option name="test-timeout" value="1m"/>
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/nfc/V1_0/host/binderize/AndroidTest.xml b/nfc/V1_0/host/binderize/AndroidTest.xml
index 749a934..b204928 100644
--- a/nfc/V1_0/host/binderize/AndroidTest.xml
+++ b/nfc/V1_0/host/binderize/AndroidTest.xml
@@ -29,5 +29,6 @@
<option name="test-module-name" value="VtsHalNfcV1_0HostBinderize" />
<option name="test-case-path" value="vts/testcases/hal/nfc/V1_0/host/VtsHalNfcV1_0HostTest" />
<option name="test-config-path" value="vts/testcases/hal/nfc/V1_0/host/binderize/NfcHidlBinderizeBasicTest.config" />
+ <option name="test-timeout" value="30m"/>
</test>
</configuration>
diff --git a/nfc/V1_0/host/passthrough/AndroidTest.xml b/nfc/V1_0/host/passthrough/AndroidTest.xml
index 5219de3..f21039f 100644
--- a/nfc/V1_0/host/passthrough/AndroidTest.xml
+++ b/nfc/V1_0/host/passthrough/AndroidTest.xml
@@ -29,5 +29,6 @@
<option name="test-module-name" value="VtsHalNfcV1_0HostPassthrough" />
<option name="test-case-path" value="vts/testcases/hal/nfc/V1_0/host/VtsHalNfcV1_0HostTest" />
<option name="test-config-path" value="vts/testcases/hal/nfc/V1_0/host/passthrough/NfcHidlPassthroughBasicTest.config" />
+ <option name="test-timeout" value="30m"/>
</test>
</configuration>
diff --git a/nfc/V1_0/host_profiling/AndroidTest.xml b/nfc/V1_0/host_profiling/AndroidTest.xml
index 65fa7e6..4e8a7be 100644
--- a/nfc/V1_0/host_profiling/AndroidTest.xml
+++ b/nfc/V1_0/host_profiling/AndroidTest.xml
@@ -32,6 +32,6 @@
<option name="test-case-path" value="vts/testcases/hal/nfc/V1_0/host/VtsHalNfcV1_0HostTest"/>
<option name="enable-profiling" value="true"/>
<option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
- <option name="test-timeout" value="1m"/>
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/nfc/V1_0/target/AndroidTest.xml b/nfc/V1_0/target/AndroidTest.xml
index eca3cc9..a743358 100644
--- a/nfc/V1_0/target/AndroidTest.xml
+++ b/nfc/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
- <option name="test-timeout" value="10m"/>
+ <option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/nfc/V1_0/target_profiling/AndroidTest.xml b/nfc/V1_0/target_profiling/AndroidTest.xml
index c188762..240c8af 100644
--- a/nfc/V1_0/target_profiling/AndroidTest.xml
+++ b/nfc/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="enable-profiling" value="true"/>
<option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
- <option name="test-timeout" value="25m"/>
+ <option name="test-timeout" value="30m"/>
</test>
</configuration>
diff --git a/nfc/V1_0/target_replay/AndroidTest.xml b/nfc/V1_0/target_replay/AndroidTest.xml
index 51ce03c..0f45c3a 100644
--- a/nfc/V1_0/target_replay/AndroidTest.xml
+++ b/nfc/V1_0/target_replay/AndroidTest.xml
@@ -32,6 +32,6 @@
<option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/nfc/V1_0/android.hardware.nfc@1.0_sailfish_1.vts.trace"/>
<option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>
<option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
- <option name="test-timeout" value="3m"/>
+ <option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/radio/V1_0/host/AndroidTest.xml b/radio/V1_0/host/AndroidTest.xml
index 0082c7b..0ccfca0 100644
--- a/radio/V1_0/host/AndroidTest.xml
+++ b/radio/V1_0/host/AndroidTest.xml
@@ -32,6 +32,6 @@
<option name="test-module-name" value="VtsHalRadioV1_0Host"/>
<option name="test-case-path" value="vts/testcases/hal/radio/V1_0/host/VtsHalRadioV1_0HostTest"/>
<option name="precondition-lshal" value="android.hardware.radio@1.0"/>
- <option name="test-timeout" value="15m"/>
+ <option name="test-timeout" value="30m"/>
</test>
</configuration>
diff --git a/radio/V1_0/target/AndroidTest.xml b/radio/V1_0/target/AndroidTest.xml
index 9731d36..27f7b93 100644
--- a/radio/V1_0/target/AndroidTest.xml
+++ b/radio/V1_0/target/AndroidTest.xml
@@ -29,12 +29,12 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.radio@1.0"/>
- <option name="test-timeout" value="10m"/>
<option name="exclude-filter" value="RadioHidlTest.getDataCallList" />
<option name="exclude-filter" value="RadioHidlTest.setRadioCapability" />
<option name="exclude-filter" value="RadioHidlTest.sendCDMAFeatureCode" />
<option name="exclude-filter" value="RadioHidlTest.setSimCardPower" />
<option name="exclude-filter" value="SapHidlTest.transferAtrReq" />
<option name="exclude-filter" value="RadioHidlTest.dial" />
+ <option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/radio/V1_0/target_profiling/AndroidTest.xml b/radio/V1_0/target_profiling/AndroidTest.xml
index 660a5d7..25d22b7 100644
--- a/radio/V1_0/target_profiling/AndroidTest.xml
+++ b/radio/V1_0/target_profiling/AndroidTest.xml
@@ -33,6 +33,6 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="enable-profiling" value="true"/>
<option name="precondition-lshal" value="android.hardware.radio@1.0"/>
- <option name="test-timeout" value="10m"/>
+ <option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/renderscript/V1_0/target/AndroidTest.xml b/renderscript/V1_0/target/AndroidTest.xml
index f023b20..92634e8 100644
--- a/renderscript/V1_0/target/AndroidTest.xml
+++ b/renderscript/V1_0/target/AndroidTest.xml
@@ -25,6 +25,6 @@
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRenderscriptV1_0TargetTest/VtsHalRenderscriptV1_0TargetTest"/>
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="precondition-lshal" value="android.hardware.renderscript@1.0"/>
- <option name="test-timeout" value="1m"/>
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/treble/platform_version/AndroidTest.xml b/treble/platform_version/AndroidTest.xml
index 2779d6a..fafaae5 100644
--- a/treble/platform_version/AndroidTest.xml
+++ b/treble/platform_version/AndroidTest.xml
@@ -22,5 +22,6 @@
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsTreblePlatformVersionTest" />
<option name="test-case-path" value="vts/testcases/hal/treble/platform_version/VtsTreblePlatformVersionTest" />
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/treble/vintf/AndroidTest.xml b/treble/vintf/AndroidTest.xml
index b5084b9..517bac5 100644
--- a/treble/vintf/AndroidTest.xml
+++ b/treble/vintf/AndroidTest.xml
@@ -30,6 +30,6 @@
<option name="binary-test-source" value="_32bit::DATA/nativetest/vts_treble_vintf_test/vts_treble_vintf_test" />
<option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_treble_vintf_test/vts_treble_vintf_test" />
<option name="binary-test-type" value="gtest"/>
- <option name="test-timeout" value="3m"/>
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/wifi/V1_0/target/base/AndroidTest.xml b/wifi/V1_0/target/base/AndroidTest.xml
index 86fd502..76c0895 100644
--- a/wifi/V1_0/target/base/AndroidTest.xml
+++ b/wifi/V1_0/target/base/AndroidTest.xml
@@ -27,6 +27,6 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.wifi@1.0"/>
- <option name="test-timeout" value="10m"/>
+ <option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/wifi/V1_0/target/nan/AndroidTest.xml b/wifi/V1_0/target/nan/AndroidTest.xml
index d06e877..518e8b7 100644
--- a/wifi/V1_0/target/nan/AndroidTest.xml
+++ b/wifi/V1_0/target/nan/AndroidTest.xml
@@ -25,6 +25,6 @@
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalWifiNanV1_0TargetTest/VtsHalWifiNanV1_0TargetTest" />
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="precondition-feature" value="android.hardware.wifi.aware" />
- <option name="test-timeout" value="10m"/>
+ <option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/wifi/V1_0/target_profiling/base/AndroidTest.xml b/wifi/V1_0/target_profiling/base/AndroidTest.xml
index ff359a4..4ae9f18 100644
--- a/wifi/V1_0/target_profiling/base/AndroidTest.xml
+++ b/wifi/V1_0/target_profiling/base/AndroidTest.xml
@@ -31,6 +31,6 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="enable-profiling" value="true"/>
<option name="precondition-lshal" value="android.hardware.wifi@1.0"/>
- <option name="test-timeout" value="10m"/>
+ <option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/wifi/V1_0/target_profiling/nan/AndroidTest.xml b/wifi/V1_0/target_profiling/nan/AndroidTest.xml
index 4c6b070..bd6353a 100644
--- a/wifi/V1_0/target_profiling/nan/AndroidTest.xml
+++ b/wifi/V1_0/target_profiling/nan/AndroidTest.xml
@@ -29,6 +29,6 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="enable-profiling" value="true"/>
<option name="precondition-feature" value="android.hardware.wifi.aware" />
- <option name="test-timeout" value="10m"/>
+ <option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml b/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
index d63f3a2..59183ce 100644
--- a/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
+++ b/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="enable-profiling" value="true"/>
<option name="precondition-lshal" value="android.hardware.wifi.supplicant@1.0"/>
- <option name="test-timeout" value="20m"/>
+ <option name="test-timeout" value="30m"/>
</test>
</configuration>
