diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-06 01:17:59 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-06 01:17:59 +0000 |
commit | fc16ebb35fea245330ec94c48e69d64929f54655 (patch) | |
tree | 008a5b0f96323878d135caafab24c96642cfa5a8 | |
parent | 6697d689b5dd3ee59acdf56ce28fdcf3aa5da3e6 (diff) | |
parent | 7e8d6dac53f46c92dbdd9059bac16ed14d74aae1 (diff) | |
download | sonivox-android14-qpr2-s3-release.tar.gz |
Snap for 10909147 from 7e8d6dac53f46c92dbdd9059bac16ed14d74aae1 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-release
Change-Id: Ia78ddfde801b1fa67d406445c06e8fc596041581
-rw-r--r-- | test/AndroidTest.xml | 15 | ||||
-rw-r--r-- | test/DynamicConfig.xml | 20 | ||||
-rw-r--r-- | test/README.md | 6 |
3 files changed, 34 insertions, 7 deletions
diff --git a/test/AndroidTest.xml b/test/AndroidTest.xml index 17a36bd..57fde9e 100644 --- a/test/AndroidTest.xml +++ b/test/AndroidTest.xml @@ -18,13 +18,20 @@ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> <option name="cleanup" value="true" /> <option name="push" value="SonivoxTest->/data/local/tmp/SonivoxTest" /> - <option name="push-file" - key="https://storage.googleapis.com/android_media/external/sonivox/test/SonivoxTestRes-1.0.zip?unzip=true" - value="/data/local/tmp/SonivoxTestRes/" /> + </target_preparer> + <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher"> + <option name="target" value="host" /> + <option name="config-filename" value="SonivoxTest" /> + <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="SonivoxTestRes-1.0"/> + <option name="dynamic-config-module" value="SonivoxTest" /> </target_preparer> <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="SonivoxTest" /> - <option name="native-test-flag" value="-P /data/local/tmp/SonivoxTestRes/" /> + <option name="native-test-flag" value="-P /sdcard/test/SonivoxTestRes-1.0/" /> </test> </configuration> diff --git a/test/DynamicConfig.xml b/test/DynamicConfig.xml new file mode 100644 index 0000000..ea28605 --- /dev/null +++ b/test/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/sonivox/test/SonivoxTestRes-1.0.zip</value> + </entry> +</dynamicConfig> diff --git a/test/README.md b/test/README.md index 9c0eed3..9232b24 100644 --- a/test/README.md +++ b/test/README.md @@ -22,15 +22,15 @@ To test 32-bit binary push binaries from nativetest. adb push ${OUT}/data/nativetest/SonivoxTest/SonivoxTest /data/local/tmp/ ``` -The resource file for the tests is taken from [here](https://storage.googleapis.com/android_media/external/sonivox/test/SonivoxTestRes-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/sonivox/test/SonivoxTestRes-1.0.zip). Download, unzip and push these files into device for testing. ``` -adb push SonivoxTestRes-1.0/. /data/local/tmp/SonivoxTestRes/ +adb push SonivoxTestRes-1.0 /sdcard/test/ ``` usage: SonivoxTest -P \<path_to_res_folder\> -C <remove_output_file> ``` -adb shell /data/local/tmp/SonivoxTest -P /data/local/tmp/SonivoxTestRes/ -C true +adb shell /data/local/tmp/SonivoxTest -P /sdcard/test/SonivoxTestRes-1.0/ -C true ``` Alternatively, the test can also be run using atest command. |