Add support for tests to declare runtime hints.
bug:21762834
Change-Id: I11f3e6ecb026dcbbb8c73c750c7a70d8a15d81fb
diff --git a/hostsidetests/aadb/AndroidTest.xml b/hostsidetests/aadb/AndroidTest.xml
index 6beed97..cfba81e 100644
--- a/hostsidetests/aadb/AndroidTest.xml
+++ b/hostsidetests/aadb/AndroidTest.xml
@@ -16,5 +16,6 @@
<configuration description="Config for the CTS aadb host tests">
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest">
<option name="jar" value="CtsAadbHostTestCases.jar" />
+ <option name="runtime-hint" value="5m30s" />
</test>
</configuration>
diff --git a/hostsidetests/appsecurity/AndroidTest.xml b/hostsidetests/appsecurity/AndroidTest.xml
index d59358c..d1989e6 100644
--- a/hostsidetests/appsecurity/AndroidTest.xml
+++ b/hostsidetests/appsecurity/AndroidTest.xml
@@ -16,5 +16,6 @@
<configuration description="Config for the CTS App Security host tests">
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsAppSecurityHostTestCases.jar" />
+ <option name="runtime-hint" value="20m" />
</test>
</configuration>
diff --git a/hostsidetests/devicepolicy/AndroidTest.xml b/hostsidetests/devicepolicy/AndroidTest.xml
index dd3444f..48b3b5b 100644
--- a/hostsidetests/devicepolicy/AndroidTest.xml
+++ b/hostsidetests/devicepolicy/AndroidTest.xml
@@ -16,5 +16,6 @@
<configuration description="Config for the CTS Device Policy host tests">
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsDevicePolicyManagerTestCases.jar" />
+ <option name="runtime-hint" value="31m41s" />
</test>
</configuration>
diff --git a/hostsidetests/jank/AndroidTest.xml b/hostsidetests/jank/AndroidTest.xml
index d392cde..a938678 100644
--- a/hostsidetests/jank/AndroidTest.xml
+++ b/hostsidetests/jank/AndroidTest.xml
@@ -16,5 +16,6 @@
<configuration description="Config for CTS Jank host test cases">
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsJankHostTestCases.jar" />
+ <option name="runtime-hint" value="4m41s" />
</test>
</configuration>
diff --git a/hostsidetests/monkey/AndroidTest.xml b/hostsidetests/monkey/AndroidTest.xml
index 5c7ec5b..799ee6a 100644
--- a/hostsidetests/monkey/AndroidTest.xml
+++ b/hostsidetests/monkey/AndroidTest.xml
@@ -16,5 +16,6 @@
<configuration description="Config for the CTS monkey host tests">
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsMonkeyTestCases.jar" />
+ <option name="runtime-hint" value="5m7s" />
</test>
</configuration>
diff --git a/hostsidetests/security/AndroidTest.xml b/hostsidetests/security/AndroidTest.xml
index 5cad5be..e521761 100644
--- a/hostsidetests/security/AndroidTest.xml
+++ b/hostsidetests/security/AndroidTest.xml
@@ -16,5 +16,6 @@
<configuration description="Config for the CTS Security host tests">
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsSecurityHostTestCases.jar" />
+ <option name="runtime-hint" value="12m13s" />
</test>
</configuration>
diff --git a/hostsidetests/services/activitymanager/AndroidTest.xml b/hostsidetests/services/activitymanager/AndroidTest.xml
index e8f052f..ce407a3 100644
--- a/hostsidetests/services/activitymanager/AndroidTest.xml
+++ b/hostsidetests/services/activitymanager/AndroidTest.xml
@@ -19,6 +19,6 @@
<option name="test-file-name" value="CtsDeviceServicesTestApp.apk" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
- <option name="jar" value="CtsServivcesHostTestCases.jar" />
+ <option name="jar" value="CtsServicesHostTestCases.jar" />
</test>
</configuration>
diff --git a/hostsidetests/services/activitymanager/OldAndroidTest.xml b/hostsidetests/services/activitymanager/OldAndroidTest.xml
index ba9d998..37393763 100644
--- a/hostsidetests/services/activitymanager/OldAndroidTest.xml
+++ b/hostsidetests/services/activitymanager/OldAndroidTest.xml
@@ -16,5 +16,5 @@
<configuration description="CTS package preparer for install/uninstall of the apk used as a test operation target">
<include name="common-config" />
<!-- This will tell tradefed to install the test apk. -->
- <option name="cts-apk-installer:test-file-name" value="CtsServicesTestApp.apk" />
+ <option name="cts-apk-installer:test-file-name" value="CtsDeviceServicesTestApp.apk" />
</configuration>
diff --git a/hostsidetests/services/activitymanager/app/Android.mk b/hostsidetests/services/activitymanager/app/Android.mk
index c6d4722..4633ce2 100644
--- a/hostsidetests/services/activitymanager/app/Android.mk
+++ b/hostsidetests/services/activitymanager/app/Android.mk
@@ -26,6 +26,6 @@
# Tag this module as a cts_v2 test artifact
LOCAL_COMPATIBILITY_SUITE := cts_v2
-LOCAL_PACKAGE_NAME := CtsServicesTestApp
+LOCAL_PACKAGE_NAME := CtsDeviceServicesTestApp
include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/ui/AndroidTest.xml b/hostsidetests/ui/AndroidTest.xml
index 1a59817..7d17e2b 100644
--- a/hostsidetests/ui/AndroidTest.xml
+++ b/hostsidetests/ui/AndroidTest.xml
@@ -16,5 +16,6 @@
<configuration description="Config for CTS UI host test cases">
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsUiHostTestCases.jar" />
+ <option name="runtime-hint" value="2m" />
</test>
</configuration>