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

Commit c1e550d5 authored by Dan Shi's avatar Dan Shi Committed by Steven Moreland
Browse files

Support test runnner option in auto generated test configs 

Bug: 284179405
Bug: 236980335
Test: unittest
Change-Id: I7f96a2a2bc52316888e87af7e4bcc4ef50863716
parent 9ea49efa

core/instrumentation_test_config_template.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 The Android Open Source Project

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ 
    </target_preparer>



    <test class="com.android.tradefed.testtype.{TEST_TYPE}" >

        <option name="package" value="{PACKAGE}" />

        {EXTRA_TEST_RUNNER_CONFIGS}<option name="package" value="{PACKAGE}" />

        <option name="runner" value="{RUNNER}" />

    </test>

</configuration>

core/java_host_test_config_template.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -21,6 +21,6 @@ 
    {EXTRA_CONFIGS}



    <test class="com.android.tradefed.testtype.HostTest" >

        <option name="jar" value="{MODULE}.jar" />

        {EXTRA_TEST_RUNNER_CONFIGS}<option name="jar" value="{MODULE}.jar" />

    </test>

</configuration>

core/native_test_config_template.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 The Android Open Source Project

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ 
    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="{TEST_INSTALL_BASE}" />

        {EXTRA_TEST_RUNNER_CONFIGS}<option name="native-test-device-path" value="{TEST_INSTALL_BASE}" />

        <option name="module-name" value="{MODULE}" />

    </test>

</configuration>