diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-05 00:26:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 00:26:58 +0000 |
commit | e44e1dd99e51b5a2b91472ef17f4e83b0b872fc4 (patch) | |
tree | 2f085002d4cce75911f871b78aa0a4c455d7f1db | |
parent | 996d06e539ba0b73aebd6d29d222316a0a822ede (diff) | |
parent | 06dfaf38b19c2e794f01f072415c50466b2f087e (diff) | |
download | tremolo-e44e1dd99e51b5a2b91472ef17f4e83b0b872fc4.tar.gz |
Merge "VorbisDecoderTest: Use MediaPreparer to download test files" into main am: c14f6a591e am: ab377a8756 am: 088d24d899 am: 5a749289a3 am: 06dfaf38b1
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2771028
Change-Id: Ia52df1ded5398c7b8abb79aea3bd51e84200034a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/AndroidTest.xml | 15 | ||||
-rw-r--r-- | tests/DynamicConfig.xml | 20 | ||||
-rw-r--r-- | tests/README.md | 6 |
3 files changed, 34 insertions, 7 deletions
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml index cb81d5f..afa2db7 100644 --- a/tests/AndroidTest.xml +++ b/tests/AndroidTest.xml @@ -15,14 +15,21 @@ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> <option name="cleanup" value="true" /> <option name="push" value="VorbisDecoderTest->/data/local/tmp/VorbisDecoderTest" /> - <option name="push-file" - key="https://storage.googleapis.com/android_media/external/tremolo/tests/VorbisDecoderRes-1.0.zip?unzip=true" - value="/data/local/tmp/VorbisDecoderTestRes/" /> </target_preparer> + <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher"> + <option name="target" value="host" /> + <option name="config-filename" value="VorbisDecoderTest" /> + <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="VorbisDecoderTest-1.0" /> + <option name="dynamic-config-module" value="VorbisDecoderTest" /> + </target_preparer> <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="VorbisDecoderTest" /> - <option name="native-test-flag" value="-P /data/local/tmp/VorbisDecoderTestRes/" /> + <option name="native-test-flag" value="-P /sdcard/test/VorbisDecoderTest-1.0/" /> <option name="native-test-flag" value="-C true" /> </test> </configuration> diff --git a/tests/DynamicConfig.xml b/tests/DynamicConfig.xml new file mode 100644 index 0000000..023b1b3 --- /dev/null +++ b/tests/DynamicConfig.xml @@ -0,0 +1,20 @@ +<!-- Copyright (C) 2023 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://dl.google.com/android-unittest/media/external/tremolo/tests/VorbisDecoderRes-1.0.zip</value> + </entry> +</dynamicConfig> diff --git a/tests/README.md b/tests/README.md index 8eb17cd..b28be9f 100644 --- a/tests/README.md +++ b/tests/README.md @@ -22,15 +22,15 @@ To test 32-bit binary push binaries from nativetest. adb push ${OUT}/data/nativetest/VorbisDecoderTest/VorbisDecoderTest /data/local/tmp/ ``` -The resource file for the tests is taken from [here](https://storage.googleapis.com/android_media/external/tremolo/tests/VorbisDecoderRes-1.0.zip). Download, unzip and push these files into device for testing. +The resource file for the tests is taken from [here](https://dl.google.com/android-unittest/media/external/tremolo/tests/VorbisDecoderRes-1.0.zip). Download, unzip and push these files into device for testing. ``` -adb push VorbisDecoderTestRes /data/local/tmp/ +adb push VorbisDecoderRes-1.0 /sdcard/test/ ``` usage: VorbisDecoderTest -P \<path_to_folder\> -C <remove_output_file> ``` -adb shell /data/local/tmp/VorbisDecoderTest -P /data/local/tmp/VorbisDecoderTestRes/ -C true +adb shell /data/local/tmp/VorbisDecoderTest -P /sdcard/test/VorbisDecoderRes-1.0/ -C true ``` Alternatively, the test can also be run using atest command. |