summaryrefslogtreecommitdiffstats
path: root/testrunner
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@android.com>2010-07-28 11:46:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-28 11:46:55 -0700
commit3a5897a4fefd3af855eb600ab532113863b45182 (patch)
tree618b12b577f4d40b50e6b88bfd9ac921f2e26eee /testrunner
parent1794ebca8f2aaca34e5a8cf101e8d581e1aee577 (diff)
parentd53cf3ba04f48d234200e8418876db62cb0b6b56 (diff)
downloadandroid_development-3a5897a4fefd3af855eb600ab532113863b45182.tar.gz
android_development-3a5897a4fefd3af855eb600ab532113863b45182.tar.bz2
android_development-3a5897a4fefd3af855eb600ab532113863b45182.zip
am d53cf3ba: am 8ddb2873: Change hosttestlib to use ddm-prebuilt.
Merge commit 'd53cf3ba04f48d234200e8418876db62cb0b6b56' * commit 'd53cf3ba04f48d234200e8418876db62cb0b6b56': Change hosttestlib to use ddm-prebuilt.
Diffstat (limited to 'testrunner')
-rw-r--r--testrunner/test_defs/host_test.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/testrunner/test_defs/host_test.py b/testrunner/test_defs/host_test.py
index 81050754c..273042ab5 100644
--- a/testrunner/test_defs/host_test.py
+++ b/testrunner/test_defs/host_test.py
@@ -31,15 +31,12 @@ class HostTestSuite(test_suite.AbstractTestSuite):
_JUNIT_JAR_NAME = "junit.jar"
_HOSTTESTLIB_NAME = "hosttestlib.jar"
- _DDMLIB_NAME = "ddmlib.jar"
+ _DDMLIB_NAME = "ddmlib-prebuilt.jar"
_lib_names = [_JUNIT_JAR_NAME, _HOSTTESTLIB_NAME, _DDMLIB_NAME]
_JUNIT_BUILD_PATH = os.path.join("external", "junit")
_HOSTTESTLIB_BUILD_PATH = os.path.join("development", "tools", "hosttestlib")
- _DDMLIB_BUILD_PATH = os.path.join("development", "tools", "ddms", "libs",
- "ddmlib")
- _LIB_BUILD_PATHS = [_JUNIT_BUILD_PATH, _HOSTTESTLIB_BUILD_PATH,
- _DDMLIB_BUILD_PATH]
+ _LIB_BUILD_PATHS = [_JUNIT_BUILD_PATH, _HOSTTESTLIB_BUILD_PATH ]
# main class for running host tests
# TODO: should other runners be supported, and make runner an attribute of