Change hwui_unit_tests (and benchmarks) to push to non-root writable dir am: 1aa54918b8 am: 85e8dbe6ae

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2379068

Change-Id: I73e68b2966055c81852700b6e1853cd8f98ba819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nolan Scobie
2023-01-10 18:29:13 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 7 deletions

View File

@@ -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: {

View File

@@ -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>