am 764d3fa7: Add support for running host java tests to runtest.

Merge commit '764d3fa70d42a79e2ee999b790e69fc55f12bf61'

* commit '764d3fa70d42a79e2ee999b790e69fc55f12bf61':
  Add support for running host java tests to runtest.

testrunner/test_defs.xml

@@ -17,72 +17,12 @@
 <!--
 This file contains standard test definitions for the Android platform
 
-Java tests are defined by <test> tags and native ones (C/C++) are defined by
-<test-native> tags.
+The following test types are supported:
+ - On device Java instrumentation tests are defined by <test> tags.
+ - native ones (C/C++) are defined by <test-native> tags.
+ - host java tests are defined by <test-host> tags.
 
-JAVA/application tests:
-=======================
-  The java <test> element has the following attributes
-
-  name package [class runner build_path coverage_target continuous description]
-
-  Where:
-  name: Self-descriptive name used to uniquely identify the test
-  build_path: File system path, relative to Android build root, to this
-    package's Android.mk file. If omitted, build/sync step for this test will
-    be skipped.
-  package: Android application package that contains the tests
-  class: Optional. Fully qualified Java test class to run.
-  runner: Fully qualified InstrumentationTestRunner to execute. If omitted,
-     will default to android.test.InstrumentationTestRunner.
-  coverage_target: Build name of Android package this test targets - these
-    targets are defined in the coverage_targets.xml file.  Used as basis for
-    code coverage metrics. If omitted, code coverage will not be supported for
-    this test.
-  continuous: Optional boolean. Default is false. Set to true if tests are known
-    to be reliable, and should be included in a continuous test system. false if
-    they are under development.
-  cts: Optional boolean. Default is false. Set to true if test is included in
-    compatibility test suite.
-
-  description: Optional string. Default is empty. Short description (typically
-     less than 60 characters) about this test.
-
-  These attributes map to the following commands:
-  (if class is defined)
-      adb shell am instrument -w <package>/<runner>
-  (else)
-      adb shell am instrument -w -e class <class> <package>/<runner>
-
-Native tests:
-=============
-  The <test-native> element has the following attributes
-
-  name build_path [continuous description extra_make_args]
-
-  Where:
-  name: Self-descriptive name used to uniquely identify the test
-  build_path: File system path, relative to Android build root, to this
-     package's Android.mk file. By convention the name of a test should match:
-      - test_*.[cc|cpp]
-      - *_test.[cc|cpp]
-      - *_unittest.[cc|cpp]
-
-  continuous: Optional boolean. Default is false. Set to true if tests are known
-     to be reliable, and should be included in a continuous test system.
-     false if they are under development.
-  description: Optional string. Default is empty. Short description (typically
-     less than 60 characters) about this test.
-  extra_make_args: Optional string. Default is empty. Some test module require
-     extra make arguments to build. This string is append to the make command.
-
-  These attributes map to the following commands:
-    make <build_path>/Android.mk <extra_make_args>
-    adb sync
-    for test_prog in <tests built>; do
-      adb shell "/system/bin/${test_prog} >/dev/null 2>&1;echo \$?"
-      adb shell "rm /system/bin/${test_prog}"
-    done
+See test_defs.xsd for more information.
 -->
 
 <test-definitions xmlns="http://schemas.android.com/testrunner/test_defs/1.0"
@@ -515,7 +455,7 @@ Native tests:
 <test-native name="libstdcpp"
     build_path="system/extras/tests/bionic/libstdc++"
     description="Bionic libstdc++."
-    extra_make_args="BIONIC_TESTS=1" />
+    extra_build_args="BIONIC_TESTS=1" />
 
 <test-native name="libskia"
     build_path="external/skia/tests"
@@ -525,13 +465,20 @@ Native tests:
 <test-native name="astl"
     build_path="external/astl/tests"
     description="Android STL."
-    extra_make_args="ASTL_TESTS=1" />
+    extra_build_args="ASTL_TESTS=1" />
 
 <!-- pending patch 820
 <test-native name="gtest"
     build_path="external/gtest"
     description="Google test."
-    extra_make_args="GTEST_TESTS=1" />
+    extra_build_args="GTEST_TESTS=1" />
 -->
 
+<!-- host java tests -->
+<test-host name="cts-appinstall"
+    build_path="cts/tests/install-tests"
+    class="com.android.cts.install.InstallTests"
+    jar_name="CtsInstallTests.jar"
+    cts="true" />
+
 </test-definitions>