tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 9d57bf30e5

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1832959

Change-Id: I8d2436e24abdff9dbbeb23db34a420246c69f3b1
This commit is contained in:
Treehugger Robot 2021-09-22 06:45:42 +00:00 committed by Automerger Merge Worker
commit ae5c1cf357
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/autogen_test_config.mk
View file

@ -22,7 +22,8 @@
# autogen_test_config_file: Path to the test config file generated.
autogen_test_config_file := $(dir $(LOCAL_BUILT_MODULE))$(LOCAL_MODULE).config
autogen_test_install_base := /data/local/tests/unrestricted
# TODO: (b/167308193) Switch to /data/local/tests/unrestricted as the default install base.
autogen_test_install_base := /data/local/tmp
# Automatically setup test root for native test.
ifeq (true,$(is_native))
ifeq (true,$(LOCAL_VENDOR_MODULE))

4
core/native_benchmark_test_config_template.xml
View file

@ -22,10 +22,10 @@
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="{MODULE}->/data/local/tests/unrestricted/{MODULE}" />
<option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
</target_preparer>
<test class="com.android.tradefed.testtype.GoogleBenchmarkTest" >
<option name="native-benchmark-device-path" value="/data/local/tests/unrestricted" />
<option name="native-benchmark-device-path" value="/data/local/tmp" />
<option name="benchmark-module-name" value="{MODULE}" />
</test>
</configuration>

4
core/rust_device_benchmark_config_template.xml
View file

@ -17,11 +17,11 @@
<configuration description="Config to run {MODULE} rust benchmark tests.">
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="false" />
<option name="push" value="{MODULE}->/data/local/tests/unrestricted/{MODULE}" />
<option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
</target_preparer>
<test class="com.android.tradefed.testtype.rust.RustBinaryTest" >
<option name="test-device-path" value="/data/local/tests/unrestricted" />
<option name="test-device-path" value="/data/local/tmp" />
<option name="module-name" value="{MODULE}" />
<option name="is-benchmark" value="true" />
</test>

4
core/rust_device_test_config_template.xml
View file

@ -17,11 +17,11 @@
<configuration description="Config to run {MODULE} device tests.">
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="{MODULE}->/data/local/tests/unrestricted/{MODULE}" />
<option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
</target_preparer>
<test class="com.android.tradefed.testtype.rust.RustBinaryTest" >
<option name="test-device-path" value="/data/local/tests/unrestricted" />
<option name="test-device-path" value="/data/local/tmp" />
<option name="module-name" value="{MODULE}" />
</test>
</configuration>