summaryrefslogtreecommitdiffstats
path: root/testrunner
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-23 13:08:23 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-23 13:08:23 -0700
commitd880efaa3f1b8333389699cf40e3010d628e66db (patch)
tree369616a75348b772429aa1393d4f177d50dbfa7d /testrunner
parent1e7c475ec2b5c411107dd9f994f9152040f73933 (diff)
parent3db7a730bce818196c216945f866939bf8a7401f (diff)
downloadandroid_development-d880efaa3f1b8333389699cf40e3010d628e66db.tar.gz
android_development-d880efaa3f1b8333389699cf40e3010d628e66db.tar.bz2
android_development-d880efaa3f1b8333389699cf40e3010d628e66db.zip
am 3db7a730: Merge change 4880 into donut
Merge commit '3db7a730bce818196c216945f866939bf8a7401f' * commit '3db7a730bce818196c216945f866939bf8a7401f': Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.
Diffstat (limited to 'testrunner')
-rw-r--r--testrunner/test_defs.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 43ad49cf6..1520c43ea 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -197,6 +197,14 @@ Native tests:
continuous="true"
cts="true" />
+<test name="cts-permission2"
+ build_path="cts/tests/tests/permission2"
+ package="com.android.cts.permission2"
+ runner="android.test.InstrumentationTestRunner"
+ coverage_target="framework"
+ continuous="true"
+ cts="true" />
+
<test name="cts-process"
build_path="cts/tests"
package="com.android.cts.process"