diff options
| author | 2022-11-09 15:23:07 -0500 | |
|---|---|---|
| committer | 2023-01-06 14:43:26 -0500 | |
| commit | 1aa54918b84e0014397b6b5f6c44a47cbb60d99b (patch) | |
| tree | e7df4fdf43a928049a3d272fe6bc6db2704165fc | |
| parent | e073b7ed659145f64acc1697312a5f2ac803077d (diff) | |
Change hwui_unit_tests (and benchmarks) to push to non-root writable dir
...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
| -rw-r--r-- | libs/hwui/Android.bp | 2 | ||||
| -rw-r--r-- | libs/hwui/AndroidTest.xml | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index c0220879094a..2800e3148988 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -634,7 +634,7 @@ cc_library_static { cc_defaults { name: "hwui_test_defaults", defaults: ["hwui_defaults"], - test_suites: ["device-tests"], + test_suites: ["general-tests"], header_libs: ["libandroid_headers_private"], target: { android: { diff --git a/libs/hwui/AndroidTest.xml b/libs/hwui/AndroidTest.xml index 381fb9f6c7bf..911315f81a8a 100644 --- a/libs/hwui/AndroidTest.xml +++ b/libs/hwui/AndroidTest.xml @@ -16,22 +16,22 @@ <configuration description="Config for hwuimicro"> <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> <option name="cleanup" value="true" /> - <option name="push" value="hwui_unit_tests->/data/nativetest/hwui_unit_tests" /> - <option name="push" value="hwuimicro->/data/benchmarktest/hwuimicro" /> - <option name="push" value="hwuimacro->/data/benchmarktest/hwuimacro" /> + <option name="push" value="hwui_unit_tests->/data/local/tmp/nativetest/hwui_unit_tests" /> + <option name="push" value="hwuimicro->/data/local/tmp/benchmarktest/hwuimicro" /> + <option name="push" value="hwuimacro->/data/local/tmp/benchmarktest/hwuimacro" /> </target_preparer> <option name="test-suite-tag" value="apct" /> <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" /> </test> <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="file-exclusion-filter-regex" value=".*\.config$" /> </test> <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="file-exclusion-filter-regex" value=".*\.config$" /> </test> |