diff options
| author | Ray Essick <essick@google.com> | 2024-05-09 20:49:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-09 20:49:51 +0000 |
| commit | 6bd7a9b4bf759d2594eb76823890e7c55ab51cc1 (patch) | |
| tree | 860b41954375646b487fb4551f10cf03034e07f4 | |
| parent | 0111eb723f65a32ec59cda9d8e4e5f9fea01a312 (diff) | |
| parent | 8eebecbf170a8763b0e710682a3c2463f5085a6e (diff) | |
| download | cts-6bd7a9b4bf759d2594eb76823890e7c55ab51cc1.tar.gz | |
Merge "MediaMisc: Update to CtsMediaMiscTestCases-2.3.zip" into main
| -rw-r--r-- | tests/tests/media/misc/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | tests/tests/media/misc/DynamicConfig.xml | 2 | ||||
| -rwxr-xr-x | tests/tests/media/misc/copy_media.sh | 2 | ||||
| -rw-r--r-- | tests/tests/media/misc/src/android/media/misc/cts/WorkDir.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/tests/media/misc/AndroidTest.xml b/tests/tests/media/misc/AndroidTest.xml index ed3133fe29c..546a15bac8d 100644 --- a/tests/tests/media/misc/AndroidTest.xml +++ b/tests/tests/media/misc/AndroidTest.xml @@ -41,7 +41,7 @@ </target_preparer> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.MediaPreparer"> <option name="push-all" value="true" /> - <option name="media-folder-name" value="CtsMediaMiscTestCases-2.2" /> + <option name="media-folder-name" value="CtsMediaMiscTestCases-2.3" /> <option name="dynamic-config-module" value="CtsMediaMiscTestCases" /> </target_preparer> <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> diff --git a/tests/tests/media/misc/DynamicConfig.xml b/tests/tests/media/misc/DynamicConfig.xml index ed21ce3cd35..2eec4491804 100644 --- a/tests/tests/media/misc/DynamicConfig.xml +++ b/tests/tests/media/misc/DynamicConfig.xml @@ -15,6 +15,6 @@ <dynamicConfig> <entry key="media_files_url"> - <value>https://dl.google.com/android/xts/cts/tests/tests/media/misc/CtsMediaMiscTestCases-2.2.zip</value> + <value>https://dl.google.com/android/xts/cts/tests/tests/media/misc/CtsMediaMiscTestCases-2.3.zip</value> </entry> </dynamicConfig> diff --git a/tests/tests/media/misc/copy_media.sh b/tests/tests/media/misc/copy_media.sh index c8381975d7b..16538a1bf95 100755 --- a/tests/tests/media/misc/copy_media.sh +++ b/tests/tests/media/misc/copy_media.sh @@ -17,4 +17,4 @@ [ -z "$MEDIA_ROOT_DIR" ] && MEDIA_ROOT_DIR=$(dirname $0)/.. source $MEDIA_ROOT_DIR/common/copy_media_utils.sh get_adb_options "$@" -copy_media "misc" "CtsMediaMiscTestCases-2.2" +copy_media "misc" "CtsMediaMiscTestCases-2.3" diff --git a/tests/tests/media/misc/src/android/media/misc/cts/WorkDir.java b/tests/tests/media/misc/src/android/media/misc/cts/WorkDir.java index 6cbab7c5376..e8e3e183aed 100644 --- a/tests/tests/media/misc/src/android/media/misc/cts/WorkDir.java +++ b/tests/tests/media/misc/src/android/media/misc/cts/WorkDir.java @@ -20,6 +20,6 @@ import android.media.cts.WorkDirBase; class WorkDir extends WorkDirBase { public static final String getMediaDirString() { - return getMediaDirString("CtsMediaMiscTestCases-2.2"); + return getMediaDirString("CtsMediaMiscTestCases-2.3"); } } |