From e1a13f8b3ce11f96a0f084fcfbc862371f1de1a1 Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Mon, 28 Nov 2016 07:14:09 -0800 Subject: [PATCH] MB: Remove a --target-devices-file flag for JUnit tests on android. Not needed since it doesn't run in a device. It will enable us to run JUnit tests on android on swarming too :) and more good stuff like flakiness dashboard BUG=chromium:497757 R=kjellander@webrtc.org Review-Url: https://codereview.webrtc.org/2531993003 Cr-Commit-Position: refs/heads/master@{#15268} --- tools/mb/mb.py | 6 +++--- tools/mb/mb_unittest.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/mb/mb.py b/tools/mb/mb.py index bf3e1f6f0b..5ae0a7fe8e 100755 --- a/tools/mb/mb.py +++ b/tools/mb/mb.py @@ -1091,11 +1091,11 @@ class MetaBuildWrapper(object): test_cmdline = [ self.PathJoin('bin', 'run_%s' % target), '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', - '--target-devices-file', '${SWARMING_BOT_FILE}', - '-v', ] + if test_type != 'junit_test': + test_cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}',] cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py'] - + logdog_command + test_cmdline) + + logdog_command + test_cmdline + ['-v']) else: extra_files = ['../../testing/test_env.py'] diff --git a/tools/mb/mb_unittest.py b/tools/mb/mb_unittest.py index cba78f8658..fe0ffc974b 100755 --- a/tools/mb/mb_unittest.py +++ b/tools/mb/mb_unittest.py @@ -457,7 +457,6 @@ class UnitTest(unittest.TestCase): '--name', 'unified_logcats', 'bin/run_base_unittests', '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', - '--target-devices-file', '${SWARMING_BOT_FILE}', '-v', ])