am 452de9c9: Merge "More test_defs cleanup." into froyo

Merge commit '452de9c984b7a21a2208834260a9bb6ce1b0d1a2' into froyo-plus-aosp

* commit '452de9c984b7a21a2208834260a9bb6ce1b0d1a2':
  More test_defs cleanup.
This commit is contained in:
Brett Chabot
2010-04-02 10:28:33 -07:00
committed by Android Git Automerger

View File

@@ -104,9 +104,11 @@ See test_defs.xsd for more information.
coverage_target="framework" coverage_target="framework"
continuous="true" /> continuous="true" />
<test name="common" <test name="framework-common"
build_path="frameworks/base/common/tests" build_path="frameworks/base/common/tests"
package="com.android.common.tests" /> package="com.android.common.tests"
coverage_target="framework"
continuous="true" />
<!-- end of framework tests --> <!-- end of framework tests -->
@@ -377,14 +379,7 @@ See test_defs.xsd for more information.
<test name="browser" <test name="browser"
build_path="packages/apps/Browser" build_path="packages/apps/Browser"
package="com.android.browser" package="com.android.browser.tests"
runner=".BrowserTestRunner"
coverage_target="Browser" />
<test name="browserfunc"
build_path="packages/apps/Browser"
package="com.android.browser"
runner=".BrowserFunctionalTestRunner"
coverage_target="Browser" /> coverage_target="Browser" />
<test name="calendar" <test name="calendar"
@@ -419,11 +414,6 @@ See test_defs.xsd for more information.
runner="com.android.contacts.ContactsLaunchPerformance" runner="com.android.contacts.ContactsLaunchPerformance"
description="Launch performance for Contacts." /> description="Launch performance for Contacts." />
<test name="gcontactsprov"
build_path="packages/providers/GoogleContactsProvider/tests"
package="com.android.providers.contactstests"
coverage_target="GoogleContactsProvider" />
<test name="downloadprovider-permission" <test name="downloadprovider-permission"
build_path="packages/providers/DownloadProvider/tests/permission" build_path="packages/providers/DownloadProvider/tests/permission"
package="com.android.providers.downloads.permission.tests" package="com.android.providers.downloads.permission.tests"
@@ -442,7 +432,6 @@ See test_defs.xsd for more information.
class="com.android.email.SmallTests" class="com.android.email.SmallTests"
coverage_target="Email" /> coverage_target="Email" />
<test name="musicplayer" <test name="musicplayer"
build_path="packages/apps/Music" build_path="packages/apps/Music"
package="com.android.music.tests" package="com.android.music.tests"
@@ -454,12 +443,6 @@ See test_defs.xsd for more information.
package="com.android.mms.tests" package="com.android.mms.tests"
coverage_target="Mms" /> coverage_target="Mms" />
<test name="mmslaunch"
build_path="packages/apps/Mms"
package="com.android.mms.tests"
runner="com.android.mms.SmsLaunchPerformance"
coverage_target="Mms" />
<!-- Unit tests for the phone application. --> <!-- Unit tests for the phone application. -->
<test name="phone-unit" <test name="phone-unit"
build_path="packages/apps/Phone" build_path="packages/apps/Phone"