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

Commit ba332a46 authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "extractortest -> ExtractorFactoryTest" into main

parents f9398d09 260cfb75

media/libstagefright/tests/extractorFactory/AndroidTest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,13 +26,13 @@ 
    </target_preparer>

    </target_preparer>

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

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

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

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

        <option name="media-folder-name" value="/data/local/tmp/extractor-1.5" />

        <option name="media-folder-name" value="/data/local/tmp/extractorFactory-1.5" />

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

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

    </target_preparer>

    </target_preparer>





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

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

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="ExtractorFactoryTest" />

        <option name="module-name" value="ExtractorFactoryTest" />

        <option name="native-test-flag" value="-P /data/local/tmp/extractor-1.5/" />

        <option name="native-test-flag" value="-P /data/local/tmp/extractorFactory-1.5/" />

    </test>

    </test>

</configuration>
 
</configuration>

media/libstagefright/tests/extractorFactory/DynamicConfig.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,6 @@ 




<dynamicConfig>

<dynamicConfig>

    <entry key="media_files_url">

    <entry key="media_files_url">

            <value>https://dl.google.com/android-unittest/media/frameworks/av/media/libstagefright/tests/extractorFactory/extractor-1.5.zip</value>

            <value>https://dl.google.com/android-unittest/media/frameworks/av/media/libstagefright/tests/extractorFactory/extractorFactory-1.5.zip</value>

    </entry>

    </entry>

</dynamicConfig>
 
</dynamicConfig>

media/libstagefright/tests/extractorFactory/README.md

+3 −3
Original line number Original line Diff line number Diff line
@@ -19,16 +19,16 @@ To test 32-bit binary push binaries from nativetest. 




adb push ${OUT}/data/nativetest/ExtractorFactoryTest/ExtractorFactoryTest /data/local/tmp/

adb push ${OUT}/data/nativetest/ExtractorFactoryTest/ExtractorFactoryTest /data/local/tmp/





The resource file for the tests is taken from [here](https://dl.google.com/android-unittest/media/frameworks/av/media/libstagefright/tests/extractorFactory/extractor-1.5.zip).

The resource file for the tests is taken from [here](https://dl.google.com/android-unittest/media/frameworks/av/media/libstagefright/tests/extractorFactory/extractorFactory-1.5.zip).

Download, unzip and push these files into device for testing.

Download, unzip and push these files into device for testing.





```

```

adb push extractor-1.5 /data/local/tmp/

adb push extractorFactory-1.5 /data/local/tmp/

```

```





usage: ExtractorFactoryTest -P \<path_to_res_folder\>

usage: ExtractorFactoryTest -P \<path_to_res_folder\>

```

```

adb shell /data/local/tmp/ExtractorFactoryTest -P /data/local/tmp/extractor-1.5/

adb shell /data/local/tmp/ExtractorFactoryTest -P /data/local/tmp/extractorFactory-1.5/

```

```

Alternatively, the test can also be run using atest command.

Alternatively, the test can also be run using atest command.