Merge "Support test runnner option in auto generated test configs"
This commit is contained in:
commit
876912a2a1
3 changed files with 6 additions and 6 deletions
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
</target_preparer>
|
</target_preparer>
|
||||||
|
|
||||||
<test class="com.android.tradefed.testtype.{TEST_TYPE}" >
|
<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}" />
|
<option name="runner" value="{RUNNER}" />
|
||||||
</test>
|
</test>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -21,6 +21,6 @@
|
||||||
{EXTRA_CONFIGS}
|
{EXTRA_CONFIGS}
|
||||||
|
|
||||||
<test class="com.android.tradefed.testtype.HostTest" >
|
<test class="com.android.tradefed.testtype.HostTest" >
|
||||||
<option name="jar" value="{MODULE}.jar" />
|
{EXTRA_TEST_RUNNER_CONFIGS}<option name="jar" value="{MODULE}.jar" />
|
||||||
</test>
|
</test>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
</target_preparer>
|
</target_preparer>
|
||||||
|
|
||||||
<test class="com.android.tradefed.testtype.GTest" >
|
<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}" />
|
<option name="module-name" value="{MODULE}" />
|
||||||
</test>
|
</test>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
Loading…
Reference in a new issue