Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change hwui_unit_tests (and benchmarks) to push to non-root writable dir

Browse Source 
...and switch to more appropriate "general-tests" suite type.

This allows the test suite to be run in certain lab/infra scenarios,
like on ABTD.

Docs
device-tests to general-tests:
https://source.android.com/docs/core/tests/development/test-mapping#packaging_build_script_rules

Tests
Without this change: [redacted]
(tooling fails to push content)
With this change: [redacted]
(gets past tooling failure, and fails on an actually failing unit test)

Test: see internal CL for links
Bug: 257123741
Change-Id: I33696a0f1c9279622138e4dc4c49d73c99f359eb
Merged-In: I33696a0f1c9279622138e4dc4c49d73c99f359eb
This commit is contained in:
Nolan Scobie
2022-11-09 15:23:07 -05:00
parent e073b7ed65
commit 1aa54918b8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/Android.bp
View File

@@ -634,7 +634,7 @@ cc_library_static {
cc_defaults { cc_defaults {
name: "hwui_test_defaults", name: "hwui_test_defaults",
defaults: ["hwui_defaults"], defaults: ["hwui_defaults"],
test_suites: ["device-tests"], test_suites: ["general-tests"],
header_libs: ["libandroid_headers_private"], header_libs: ["libandroid_headers_private"],
target: { target: {
android: { android: {

12
libs/hwui/AndroidTest.xml
View File

@@ -16,22 +16,22 @@
<configuration description="Config for hwuimicro"> <configuration description="Config for hwuimicro">
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" /> <option name="cleanup" value="true" />
<option name="push" value="hwui_unit_tests->/data/nativetest/hwui_unit_tests" /> <option name="push" value="hwui_unit_tests->/data/local/tmp/nativetest/hwui_unit_tests" />
<option name="push" value="hwuimicro->/data/benchmarktest/hwuimicro" /> <option name="push" value="hwuimicro->/data/local/tmp/benchmarktest/hwuimicro" />
<option name="push" value="hwuimacro->/data/benchmarktest/hwuimacro" /> <option name="push" value="hwuimacro->/data/local/tmp/benchmarktest/hwuimacro" />
</target_preparer> </target_preparer>
<option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct" />
<test class="com.android.tradefed.testtype.GTest" > <test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/nativetest" /> <option name="native-test-device-path" value="/data/local/tmp/nativetest" />
<option name="module-name" value="hwui_unit_tests" /> <option name="module-name" value="hwui_unit_tests" />
</test> </test>
<test class="com.android.tradefed.testtype.GoogleBenchmarkTest" > <test class="com.android.tradefed.testtype.GoogleBenchmarkTest" >
<option name="native-benchmark-device-path" value="/data/benchmarktest" /> <option name="native-benchmark-device-path" value="/data/local/tmp/benchmarktest" />
<option name="benchmark-module-name" value="hwuimicro" /> <option name="benchmark-module-name" value="hwuimicro" />
<option name="file-exclusion-filter-regex" value=".*\.config$" /> <option name="file-exclusion-filter-regex" value=".*\.config$" />
</test> </test>
<test class="com.android.tradefed.testtype.GoogleBenchmarkTest" > <test class="com.android.tradefed.testtype.GoogleBenchmarkTest" >
<option name="native-benchmark-device-path" value="/data/benchmarktest" /> <option name="native-benchmark-device-path" value="/data/local/tmp/benchmarktest" />
<option name="benchmark-module-name" value="hwuimacro" /> <option name="benchmark-module-name" value="hwuimacro" />
<option name="file-exclusion-filter-regex" value=".*\.config$" /> <option name="file-exclusion-filter-regex" value=".*\.config$" />
</test> </test>