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

Merge "Fix runtest for CTS Tests"

Browse Source
This commit is contained in:
Brian Muramatsu
2012-01-10 12:27:23 -08:00
committed by Android (Google) Code Review
parent 86034fd496 95cbc9e1ec
commit cc90809c26
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
testrunner/runtest.py
View File

@@ -233,8 +233,11 @@ class TestRunner(object):
self._TurnOffVerifier(tests) self._TurnOffVerifier(tests)
self._DoFullBuild(tests) self._DoFullBuild(tests)
target_set = Set() target_set = []
extra_args_set = Set() if self._IsCtsTests(tests):
target_set.append("cts/CtsBuild.mk")
extra_args_set = []
for test_suite in tests: for test_suite in tests:
self._AddBuildTarget(test_suite, target_set, extra_args_set) self._AddBuildTarget(test_suite, target_set, extra_args_set)
@@ -260,8 +263,8 @@ class TestRunner(object):
logger.Log(cmd) logger.Log(cmd)
run_command.RunCommand(cmd, return_output=False) run_command.RunCommand(cmd, return_output=False)
target_build_string = " ".join(list(target_set)) target_build_string = " ".join(target_set)
extra_args_string = " ".join(list(extra_args_set)) extra_args_string = " ".join(extra_args_set)
# mmm cannot be used from python, so perform a similar operation using # mmm cannot be used from python, so perform a similar operation using
# ONE_SHOT_MAKEFILE # ONE_SHOT_MAKEFILE
@@ -315,7 +318,7 @@ class TestRunner(object):
if not test_suite.IsFullMake(): if not test_suite.IsFullMake():
build_dir = test_suite.GetBuildPath() build_dir = test_suite.GetBuildPath()
if self._AddBuildTargetPath(build_dir, target_set): if self._AddBuildTargetPath(build_dir, target_set):
extra_args_set.add(test_suite.GetExtraBuildArgs()) extra_args_set.append(test_suite.GetExtraBuildArgs())
for path in test_suite.GetBuildDependencies(self._options): for path in test_suite.GetBuildDependencies(self._options):
self._AddBuildTargetPath(path, target_set) self._AddBuildTargetPath(path, target_set)
@@ -323,7 +326,7 @@ class TestRunner(object):
if build_dir is not None: if build_dir is not None:
build_file_path = os.path.join(build_dir, "Android.mk") build_file_path = os.path.join(build_dir, "Android.mk")
if os.path.isfile(os.path.join(self._root_path, build_file_path)): if os.path.isfile(os.path.join(self._root_path, build_file_path)):
target_set.add(build_file_path) target_set.append(build_file_path)
return True return True
else: else:
logger.Log("%s has no Android.mk, skipping" % build_dir) logger.Log("%s has no Android.mk, skipping" % build_dir)