diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-07-28 11:37:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 11:37:12 -0700 |
| commit | d53cf3ba04f48d234200e8418876db62cb0b6b56 (patch) | |
| tree | f9b41f9f9b4cee452653703544dc9d9794ebb1cd /testrunner | |
| parent | 255ee00edcb05e4477771f5de7351ada4a2ab6ce (diff) | |
| parent | 8ddb2873df96c7181c9358f5c9286e273648bf89 (diff) | |
| download | android_development-d53cf3ba04f48d234200e8418876db62cb0b6b56.tar.gz android_development-d53cf3ba04f48d234200e8418876db62cb0b6b56.tar.bz2 android_development-d53cf3ba04f48d234200e8418876db62cb0b6b56.zip | |
am 8ddb2873: Change hosttestlib to use ddm-prebuilt.
Merge commit '8ddb2873df96c7181c9358f5c9286e273648bf89' into gingerbread-plus-aosp
* commit '8ddb2873df96c7181c9358f5c9286e273648bf89':
Change hosttestlib to use ddm-prebuilt.
Diffstat (limited to 'testrunner')
| -rw-r--r-- | testrunner/test_defs/host_test.py | 7 |
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 |