LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

runtest: Remove unused CtsTestStubs dependency.

Browse Source 
Change-Id: Icee3004731ab5d37e8eb2caba76b19b0a5f1b1b7
This commit is contained in:
Ruben Brunk
2014-10-02 13:08:24 -07:00
parent 52af255018
commit e5aa0f3fa8
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
testrunner/runtest.py
View File

@@ -345,13 +345,6 @@ class TestRunner(object):
"""If necessary, run a full 'make' command for the tests that need it.""" """If necessary, run a full 'make' command for the tests that need it."""
extra_args_set = Set() extra_args_set = Set()
# hack to build cts dependencies
# TODO: remove this when cts dependencies are removed
is_cts = self._IsCtsTests(tests)
if is_cts:
# need to use make since these fail building with ONE_SHOT_MAKEFILE
extra_args_set.add('CtsTestStubs')
extra_args_set.add('android.core.tests.runner')
for test in tests: for test in tests:
if test.IsFullMake(): if test.IsFullMake():
if test.GetExtraBuildArgs(): if test.GetExtraBuildArgs():
@@ -373,12 +366,6 @@ class TestRunner(object):
logger.SilentLog(output) logger.SilentLog(output)
os.chdir(old_dir) os.chdir(old_dir)
self._DoInstall(output) self._DoInstall(output)
if is_cts:
# hack! hardcode install of CtsTestStubs
out = android_build.GetTestAppPath()
abs_install_path = os.path.join(out, "CtsTestStubs", "CtsTestStubs.apk")
logger.Log("adb install -r %s" % abs_install_path)
logger.Log(self._adb.Install(abs_install_path))
def _AddBuildTarget(self, test_suite, target_tree, extra_args_set): def _AddBuildTarget(self, test_suite, target_tree, extra_args_set):
if not test_suite.IsFullMake(): if not test_suite.IsFullMake():