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

Commit f7e65d4f authored by Dan Shi's avatar Dan Shi Committed by Automerger Merge Worker
Browse files

Merge "Remove EXTRA_TEST_RUNNER_CONFIGS option in template for autogen... 

Merge "Remove EXTRA_TEST_RUNNER_CONFIGS option in template for autogen instrumentation test" into main am: d22a5558 am: e4929d3c

Original change: https://android-review.googlesource.com/c/platform/build/+/2813260



Change-Id: I44f59f8c0f9db81f869175a46a624ef3cb66a35e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f705f3b3 e4929d3c

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>