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

Commit 648d294a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert MediaBenchmark to use MediaPreparer" am: c3158feb am:... 

Merge "Convert MediaBenchmark to use MediaPreparer" am: c3158feb am: 929c9a2f am: 7626e902 am: 76ba6b2b am: 077900f2 am: c984927a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2592347



Change-Id: Ia00587b934a20b84755756dc878e56833a916520
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b86fcdc c984927a

media/tests/benchmark/MediaBenchmarkTest/AndroidTest.xml

+14 −6
Original line number Diff line number Diff line
@@ -14,18 +14,26 @@ 
     limitations under the License.

-->

<configuration description="Runs Media Benchmark Tests">

    <option name="test-tag" value="MediaBenchmarkTest" />

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push-file"

            key="https://storage.googleapis.com/android_media/frameworks/av/media/tests/benchmark/MediaBenchmark.zip?unzip=true"

            value="/data/local/tmp/MediaBenchmark/res/" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="cleanup-apks" value="false" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">

        <option name="target" value="host" />

        <option name="config-filename" value="MediaBenchmarkTest" />

        <option name="version" value="1.0"/>

    </target_preparer>

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.MediaPreparer">

        <option name="push-all" value="true" />

        <option name="media-folder-name" value="MediaBenchmarkTest-1.1" />

        <option name="dynamic-config-module" value="MediaBenchmarkTest" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="MediaBenchmarkTest.apk" />

    </target_preparer>



    <option name="test-tag" value="MediaBenchmarkTest" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.media.benchmark" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

media/tests/benchmark/MediaBenchmarkTest/DynamicConfig.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<!-- Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<dynamicConfig>

    <entry key="media_files_url">

            <value>https://storage.googleapis.com/android_media/frameworks/av/media/tests/benchmark/MediaBenchmark-1.1.zip</value>

    </entry>

</dynamicConfig>

media/tests/benchmark/MediaBenchmarkTest/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line 
<resources>

    <string name="input_file_path">/data/local/tmp/MediaBenchmark/res/</string>

    <string name="input_file_path">/sdcard/test/MediaBenchmarkTest-1.1/</string>

    <string name="output_file_path">/data/local/tmp/MediaBenchmark/output/</string>

</resources>