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

Commit 906b88c7 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Support test runnner option in auto generated test configs" into... 

Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b62

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



Change-Id: Ib94e37bb60c627b13ebde83b1f16f60df62425fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0555fd1b 7b944b62

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>