am 3ea427ad: am b8b984d0: Merge change 23420 into eclair

Merge commit '3ea427ad1fe7c7b4eae2a0b64a6ea8342e143ff3'

* commit '3ea427ad1fe7c7b4eae2a0b64a6ea8342e143ff3':
  ADT: change continuous test ant script to run both functional and unit tests.
This commit is contained in:
Brett Chabot
2009-09-01 12:15:55 -07:00
committed by Android Git Automerger

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- test launcher file for Android Eclipse functional tests -->
<!-- test launcher file for Android Eclipse tests -->
<project name="testsuite" default="run" basedir=".">
<!--The following properties should be passed into this script, set to some default value for now -->
<property name="eclipse.home" value="/opt/eclipse" />
@@ -52,9 +52,9 @@
<ant target="ui-test" antfile="${library-file}" dir="${eclipse.home}">
<property name="data-dir" value="${test-folder}" />
<property name="plugin-name" value="${plugin-name}" />
<property name="classname" value="com.android.ide.eclipse.tests.FuncTests" />
<!-- pass extra vm arg to set sdk_home env variable -->
<property name="extraVMargs" value="-Dsdk_home=${sdk_home}" />
<property name="classname" value="com.android.ide.eclipse.tests.AllTests" />
<!-- pass extra vm arg to set sdk_home env and test_data env variable -->
<property name="extraVMargs" value="-Dsdk_home=${sdk_home} -Dtest_data=${test_data}" />
</ant>
</target>