diff options
| -rwxr-xr-x | ci/build_test_suites (renamed from ci/build_test_suites_x86_64-trunk_staging) | 13 | ||||
| -rw-r--r-- | ci/build_test_suites.py | 18 |
2 files changed, 10 insertions, 21 deletions
diff --git a/ci/build_test_suites_x86_64-trunk_staging b/ci/build_test_suites index cd7ba8b70d..03f6731dcd 100755 --- a/ci/build_test_suites_x86_64-trunk_staging +++ b/ci/build_test_suites @@ -16,15 +16,4 @@ import sys import build_test_suites -build_test_suites.main( - sys.argv, - extra_targets=[ - 'acts_tests', - 'cts', - 'host-unit-tests', - 'robolectric-tests', - 'test_mapping', - 'tradefed-all', - 'vts', - ], -) +build_test_suites.main(sys.argv) diff --git a/ci/build_test_suites.py b/ci/build_test_suites.py index dad34f1b16..23e896d70a 100644 --- a/ci/build_test_suites.py +++ b/ci/build_test_suites.py @@ -36,15 +36,15 @@ REQUIRED_MODULES = frozenset( ) -def build_test_suites(argv, extra_targets: set[str]): +def build_test_suites(argv): args = parse_args(argv) if is_optimization_enabled(): # Call the class to map changed files to modules to build. # TODO(lucafarsi): Move this into a replaceable class. - build_affected_modules(args, extra_targets) + build_affected_modules(args) else: - build_everything(args, extra_targets) + build_everything(args) def parse_args(argv): @@ -71,20 +71,20 @@ def is_optimization_enabled() -> bool: return False -def build_everything(args: argparse.Namespace, extra_targets: set[str]): - build_command = base_build_command(args, extra_targets) +def build_everything(args: argparse.Namespace): + build_command = base_build_command(args, args.extra_targets) build_command.append('general-tests') run_command(build_command, print_output=True) -def build_affected_modules(args: argparse.Namespace, extra_targets: set[str]): +def build_affected_modules(args: argparse.Namespace): modules_to_build = find_modules_to_build( pathlib.Path(args.change_info), args.extra_required_modules ) # Call the build command with everything. - build_command = base_build_command(args, extra_targets) + build_command = base_build_command(args, args.extra_targets) build_command.extend(modules_to_build) # When not building general-tests we also have to build the general tests # shared libs. @@ -410,5 +410,5 @@ def get_soong_var(var: str, target_release: str) -> str: return value -def main(argv, extra_targets: set[str]): - build_test_suites(argv, extra_targets) +def main(argv): + build_test_suites(argv) |