diff options
| author | 2023-10-31 15:35:19 -0700 | |
|---|---|---|
| committer | 2023-10-31 15:44:16 -0700 | |
| commit | 042bb8c6dce12074b8aaba15309235d57a539782 (patch) | |
| tree | 2b143612085775ef3858ce61104f0a8c54a77af6 | |
| parent | 4c56f45c50efaa95a49387dd8b948bde565ca021 (diff) | |
Remove EXTRA_TEST_RUNNER_CONFIGS option in template for autogen instrumentation test
Instrumentation test config created by autogen is still using python script
auto_gen_test_config.py, which doesn't support extra_runner_options yet.
Bug: 308627607
Test: m FrameworksCorePackageInstallerSessionsTests
Change-Id: Ib3bef791a9d1b3e0b68f5845dc20d2c5ec5791ec
| -rw-r--r-- | core/instrumentation_test_config_template.xml | 2 | ||||
| -rw-r--r-- | tools/auto_gen_test_config_test.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/instrumentation_test_config_template.xml b/core/instrumentation_test_config_template.xml index 379126c6de..9dfc001d10 100644 --- a/core/instrumentation_test_config_template.xml +++ b/core/instrumentation_test_config_template.xml @@ -24,7 +24,7 @@ </target_preparer> <test class="com.android.tradefed.testtype.{TEST_TYPE}" > - {EXTRA_TEST_RUNNER_CONFIGS}<option name="package" value="{PACKAGE}" /> + <option name="package" value="{PACKAGE}" /> <option name="runner" value="{RUNNER}" /> </test> </configuration> diff --git a/tools/auto_gen_test_config_test.py b/tools/auto_gen_test_config_test.py index ce97723d2c..b7ef0b0b2e 100644 --- a/tools/auto_gen_test_config_test.py +++ b/tools/auto_gen_test_config_test.py @@ -93,7 +93,7 @@ EXPECTED_JUNIT_TEST_CONFIG = """<?xml version="1.0" encoding="utf-8"?> </target_preparer> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > - {EXTRA_TEST_RUNNER_CONFIGS}<option name="package" value="com.android.my.tests.x" /> + <option name="package" value="com.android.my.tests.x" /> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> </test> </configuration> @@ -125,7 +125,7 @@ EXPECTED_INSTRUMENTATION_TEST_CONFIG = """<?xml version="1.0" encoding="utf-8"?> </target_preparer> <test class="com.android.tradefed.testtype.InstrumentationTest" > - {EXTRA_TEST_RUNNER_CONFIGS}<option name="package" value="com.android.my.tests.x" /> + <option name="package" value="com.android.my.tests.x" /> <option name="runner" value="android.test.InstrumentationTestRunner" /> </test> </configuration> @@ -178,7 +178,7 @@ INSTRUMENTATION_TEST_CONFIG_TEMPLATE_CONTENT = """<?xml version="1.0" encoding=" </target_preparer> <test class="com.android.tradefed.testtype.{TEST_TYPE}" > - {EXTRA_TEST_RUNNER_CONFIGS}<option name="package" value="{PACKAGE}" /> + <option name="package" value="{PACKAGE}" /> <option name="runner" value="{RUNNER}" /> </test> </configuration> |