AI 143831: am: CL 143819 am: CL 143765 Rename tests.xml to test_defs.xml
Original author: brettchabot
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143831
diff --git a/testrunner/Android.mk b/testrunner/Android.mk
index 93c0928..b6bde55 100644
--- a/testrunner/Android.mk
+++ b/testrunner/Android.mk
@@ -10,7 +10,7 @@
########################
include $(CLEAR_VARS)
-LOCAL_MODULE := tests.xml
+LOCAL_MODULE := test_defs.xml
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(local_target_dir)
diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index a4df950..8d36591 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -41,12 +41,12 @@
# file path to android core platform tests, relative to android build root
# TODO move these test data files to another directory
- _CORE_TEST_PATH = os.path.join("development", "testrunner", "tests.xml")
+ _CORE_TEST_PATH = os.path.join("development", "testrunner", "test_defs.xml")
# vendor glob file path patterns to tests, relative to android
# build root
_VENDOR_TEST_PATH = os.path.join("vendor", "*", "tests", "testinfo",
- "tests.xml")
+ "test_defs.xml")
_RUNTEST_USAGE = (
"usage: runtest.py [options] short-test-name[s]\n\n"
@@ -61,7 +61,7 @@
"""Processes command-line options."""
# TODO error messages on once-only or mutually-exclusive options.
user_test_default = os.path.join(os.environ.get("HOME"), ".android",
- "tests.xml")
+ "test_defs.xml")
parser = optparse.OptionParser(usage=self._RUNTEST_USAGE)
@@ -153,7 +153,7 @@
try:
known_tests = test_defs.TestDefinitions()
known_tests.Parse(core_test_path)
- # read all <android root>/vendor/*/tests/testinfo/tests.xml paths
+ # read all <android root>/vendor/*/tests/testinfo/test_defs.xml paths
vendor_tests_pattern = os.path.join(self._root_path,
self._VENDOR_TEST_PATH)
test_file_paths = glob.glob(vendor_tests_pattern)
diff --git a/testrunner/tests.xml b/testrunner/test_defs.xml
similarity index 90%
rename from testrunner/tests.xml
rename to testrunner/test_defs.xml
index 7e13a35..d186af4 100644
--- a/testrunner/tests.xml
+++ b/testrunner/test_defs.xml
@@ -186,6 +186,21 @@
package="com.android.mediaframeworktest"
runner=".MediaFrameworkUnitTestRunner"
coverage_target="framework" />
+
+<test name="musicplayer"
+ build_path="packages/apps/Music"
+ package="com.android.music.tests"
+ runner=".MusicPlayerFunctionalTestRunner"
+ coverage_target="Music"
+ continuous="true" />
+
+<!-- obsolete?
+<test name="mediaprov"
+ build_path="tests/MediaProvider"
+ package="com.android.mediaprovidertests"
+ runner=".MediaProviderTestsInstrumentation"
+ coverage_target="MediaProvider" />
+ -->
<test name="mms"
build_path="packages/apps/Mms"
@@ -199,4 +214,13 @@
runner="com.android.mms.SmsLaunchPerformance"
coverage_target="Mms" />
+
+<!-- obsolete?
+<test name="ringtone"
+ build_path="tests/RingtoneSettings"
+ package="com.android.ringtonesettingstests"
+ runner=".RingtoneSettingsInstrumentationTestRunner"
+ coverage_target="Settings" />
+-->
+
</test-definitions>
