From 98d4036f5a983ba7f64a2a65fafe441709c8c395 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Mon, 15 Jan 2018 17:37:04 +0100 Subject: [PATCH] Make it possible to run low_bandwidth_audio_test on Android swarming. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R=phoglund@webrtc.org, solenberg@webrtc.org Bug: chromium:755660 Change-Id: I8755a9c9df92fe8157c870cc7519130291441b25 Reviewed-on: https://webrtc-review.googlesource.com/39780 Reviewed-by: Fredrik Solenberg Reviewed-by: Patrik Höglund Commit-Queue: Edward Lemur Cr-Commit-Position: refs/heads/master@{#21634} --- audio/BUILD.gn | 2 +- tools_webrtc/mb/mb.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/BUILD.gn b/audio/BUILD.gn index f7b1cb5869..d3af836947 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -171,7 +171,7 @@ if (rtc_include_tests) { "../resources/voice_engine/audio_tiny48.wav", "test/low_bandwidth_audio_test.py", ] - if (is_linux) { + if (is_linux || is_android) { data += [ "../tools_webrtc/audio_quality/linux/PolqaOem64", "../tools_webrtc/audio_quality/linux/pesq", diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py index ca021d356e..682532e4d4 100755 --- a/tools_webrtc/mb/mb.py +++ b/tools_webrtc/mb/mb.py @@ -1050,14 +1050,14 @@ class MetaBuildWrapper(object): cmdline = [] extra_files = [] - if android: + if test_type == 'script': + cmdline = ['../../' + self.ToSrcRelPath(isolate_map[target]['script'])] + elif android: cmdline = ['../../build/android/test_wrapper/logdog_wrapper.py', '--target', target, '--logdog-bin-cmd', '../../bin/logdog_butler', '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', '--store-tombstones'] - elif test_type == "script": - cmdline = ['../../' + self.ToSrcRelPath(isolate_map[target]['script'])] else: extra_files = ['../../testing/test_env.py']