Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43e36c49 authored by Nolan Scobie's avatar Nolan Scobie Committed by Android (Google) Code Review
Browse files

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

parents 489bdd0d f89a38ac

libs/hwui/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,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: {

libs/hwui/AndroidTest.xml

+6 −6
Original line number Diff line number Diff line
@@ -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>