Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 042bb8c6 authored by Dan Shi's avatar Dan Shi
Browse files

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
parent 4c56f45c

core/instrumentation_test_config_template.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

tools/auto_gen_test_config_test.py

+3 −3
Original line number Diff line number Diff line
@@ -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>