cheets_CTS: use android-cts-media-1.2 for mediastress.
This pulls in some fixes to copy_media.sh. Presumably this could help
on the shards which use an unknown to me setup.
Also try to discover the shell version.
BUG=b:32978387
TEST=ran on samus
01/22 18:23:37.209 DEBUG| base_utils:0185| Running 'unzip -d
'/tmp/autotest-tradefed-install_zzejDd/5496e56a52efcc5037f0e5ebee6b2863/android-cts-media-1.2'
'/tmp/autotest-tradefed-install_zzejDd/5496e56a52efcc5037f0e5ebee6b2863/android-cts-media-1.2.zip''
01/22 18:23:53.681 DEBUG| base_utils:0185| Running 'file '/bin/sh''
01/22 18:23:53.747 DEBUG| base_utils:0280| [stdout] /bin/sh: symbolic link to bash
01/22 18:23:53.748 DEBUG| base_utils:0185| Running 'sh --version'
01/22 18:23:53.760 DEBUG| base_utils:0280| [stdout] GNU bash, version 4.3.42(1)-release (x86_64-pc-linux-gnu)
01/22 18:23:53.760 DEBUG| base_utils:0280| [stdout] Copyright (C) 2013 Free Software Foundation, Inc.
01/22 18:23:53.761 DEBUG| base_utils:0280| [stdout] License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
01/22 18:23:53.761 DEBUG| base_utils:0280| [stdout]
01/22 18:23:53.761 DEBUG| base_utils:0280| [stdout] This is free software; you are free to change and redistribute it.
01/22 18:23:53.761 DEBUG| base_utils:0280| [stdout] There is NO WARRANTY, to the extent permitted by law.
01/22 18:23:53.762 DEBUG| base_utils:0185| Running 'sh -e
'/tmp/autotest-tradefed-install_zzejDd/5496e56a52efcc5037f0e5ebee6b2863/android-cts-media-1.2/android-cts-media-1.2/copy_media.sh' all'
01/22 18:23:53.776 DEBUG| base_utils:0280| [stdout] max resolution is all
01/22 18:23:53.776 DEBUG| base_utils:0280| [stdout] adb options
01/22 18:23:53.776 DEBUG| base_utils:0280| [stdout] copying 1920x1080
01/22 18:23:53.915 ERROR| base_utils:0280| [stderr] push:
bbb_short/1920x1080/mp4_libx265_libfaac/bbb_short.fmpeg.1920x1080.mp4.libx265_3250kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4 ->
/sdcard/test/bbb_short/1920x1080/mp4_libx265_libfaac/bbb_short.fmpeg.1920x1080.mp4.libx265_3250kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4
01/22 18:23:54.243 ERROR| base_utils:0280| [stderr] push:
bbb_short/1920x1080/mp4_libx265_libfaac/bbb_short.fmpeg.1920x1080.mp4.libx265_6500kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4 ->
/sdcard/test/bbb_short/1920x1080/mp4_libx265_libfaac/bbb_short.fmpeg.1920x1080.mp4.libx265_6500kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4
Change-Id: Id17ebfa2bc7ffc1f008e27668ce12146cac6b08e
Reviewed-on: https://chromium-review.googlesource.com/431175
Trybot-Ready: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
(cherry picked from commit 6627bd4d121a2cf436cad439ba75e820378e24b9)
Reviewed-on: https://chromium-review.googlesource.com/431440
diff --git a/server/site_tests/cheets_CTS/cheets_CTS.py b/server/site_tests/cheets_CTS/cheets_CTS.py
index 1251518..9a60c9d 100644
--- a/server/site_tests/cheets_CTS/cheets_CTS.py
+++ b/server/site_tests/cheets_CTS/cheets_CTS.py
@@ -37,7 +37,7 @@
_CTS_URI = {
'arm' : _DL_CTS + 'android-cts-6.0_r12-linux_x86-arm.zip',
'x86' : _DL_CTS + 'android-cts-6.0_r12-linux_x86-x86.zip',
- 'media' : _DL_CTS + 'android-cts-media-1.1.zip'
+ 'media' : _DL_CTS + 'android-cts-media-1.2.zip'
}
@@ -111,7 +111,17 @@
cts_media = os.path.join(media, base)
copy_media = os.path.join(cts_media, 'copy_media.sh')
with pushd(cts_media):
- logging.info('sh -e %s all', copy_media)
+ try:
+ self._run('file', args=('/bin/sh',), verbose=True,
+ ignore_status=True, timeout=60,
+ stdout_tee=utils.TEE_TO_LOGS,
+ stderr_tee=utils.TEE_TO_LOGS)
+ self._run('sh', args=('--version',), verbose=True,
+ ignore_status=True, timeout=60,
+ stdout_tee=utils.TEE_TO_LOGS,
+ stderr_tee=utils.TEE_TO_LOGS)
+ except:
+ logging.warning('Could not obtain sh version.')
self._run(
'sh',
args=('-e', copy_media, 'all'),
