From 34623ce83ad40fe5fa29c044f5839b51b1064f55 Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Fri, 8 Sep 2017 07:03:13 -0700 Subject: [PATCH] WebRTC: Save logcat output to isolated outputs. NOTRY=True BUG=chromium:717417 Review-Url: https://codereview.webrtc.org/3008343002 Cr-Commit-Position: refs/heads/master@{#19748} --- tools_webrtc/mb/mb.py | 5 ++++- tools_webrtc/mb/mb_unittest.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py index 9c92c2824e..8e57d39cb5 100755 --- a/tools_webrtc/mb/mb.py +++ b/tools_webrtc/mb/mb.py @@ -1057,7 +1057,10 @@ class MetaBuildWrapper(object): if android: cmdline = ['../../build/android/test_wrapper/logdog_wrapper.py', '--target', target, - '--logdog-bin-cmd', '../../bin/logdog_butler'] + '--logdog-bin-cmd', '../../bin/logdog_butler', + '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', + '--store-tombstones'] + if test_type != 'junit_test': cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}'] else: diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py index 56ce88c16e..e6518edb4d 100755 --- a/tools_webrtc/mb/mb_unittest.py +++ b/tools_webrtc/mb/mb_unittest.py @@ -381,7 +381,9 @@ class UnitTest(unittest.TestCase): '../../build/android/test_wrapper/logdog_wrapper.py', '--target', 'base_unittests', '--logdog-bin-cmd', '../../bin/logdog_butler', - '--target-devices-file', '${SWARMING_BOT_FILE}' + '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', + '--store-tombstones', + '--target-devices-file', '${SWARMING_BOT_FILE}', ]) def test_gn_gen_swarming_android_junit_test(self): @@ -413,6 +415,8 @@ class UnitTest(unittest.TestCase): '../../build/android/test_wrapper/logdog_wrapper.py', '--target', 'base_unittests', '--logdog-bin-cmd', '../../bin/logdog_butler', + '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', + '--store-tombstones', ]) def test_gn_gen_non_parallel_console_test_launcher(self):