diff options
| -rwxr-xr-x | test/utils/regen-test-files | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files index 69ec137432..458748ce4e 100755 --- a/test/utils/regen-test-files +++ b/test/utils/regen-test-files @@ -504,9 +504,9 @@ class Generator: return True return False - # Is building `run_test` supported? + # Can `run_test` be built with Soong? # TODO(b/147814778): Add build support for more tests. - def is_buildable(self, run_test): + def is_soong_buildable(self, run_test): run_test_path = os.path.join(self.art_test_dir, run_test) # Skip tests with non-default build rules, unless these build @@ -611,9 +611,9 @@ class Generator: srcs: ["{src_dir}/**/*.java"],{extra_props} }}""" - # Is (successfully) running `run_test` supported? + # Can `run_test` be succesfully run with TradeFed? # TODO(b/147812905): Add run-time support for more tests. - def is_runnable(self, run_test): + def is_tradefed_runnable(self, run_test): run_test_path = os.path.join(self.art_test_dir, run_test) # Skip tests with non-default run rules, unless these run rules @@ -662,13 +662,13 @@ class Generator: sys.exit(1) # Do not package non-runnable ART run-tests in ART MTS (see b/363075236). - if self.is_runnable(run_test): + if self.is_tradefed_runnable(run_test): test_suites.append("mts-art") run_test_module_name = ART_RUN_TEST_MODULE_NAME_PREFIX + run_test # Set the test configuration template. - if self.is_runnable(run_test): + if self.is_tradefed_runnable(run_test): if is_cts_test: test_config_template = "art-run-test-target-cts-template" elif self.is_slow(run_test): @@ -1102,14 +1102,15 @@ class Generator: # Create a list of the tests that can currently be built, and for # which a Blueprint file is to be generated. - buildable_tests = list(filter(self.is_buildable, run_tests)) + buildable_tests = list(filter(self.is_soong_buildable, run_tests)) # Create a list of the tests that can be built and run # (successfully). These tests are to be added to ART's # `TEST_MAPPING` file and also tagged as part of TradeFed's # `art-target-run-test` test suite via the `test-suite-tag` option # in their configuration file. - expected_succeeding_tests = list(filter(self.is_runnable, buildable_tests)) + expected_succeeding_tests = list(filter(self.is_tradefed_runnable, + buildable_tests)) # Regenerate Blueprint files. # --------------------------- |