From 5583384048bc33c0fae3c8c47346de668262d9f5 Mon Sep 17 00:00:00 2001
From: ehmaldonado <ehmaldonado@webrtc.org>
Date: Mon, 13 Feb 2017 03:58:13 -0800
Subject: [PATCH] Pass isolate output dir to gtest-parallel-wrapper.py

This makes it possible to archive all test execution logs on swarming jobs.

R=kjellander@webrtc.org
BUG=webrtc:7086
NOTRY=True

Review-Url: https://codereview.webrtc.org/2686563002
Cr-Commit-Position: refs/heads/master@{#16574}
---
 tools-webrtc/mb/mb.py          | 9 ++++++---
 tools-webrtc/mb/mb_unittest.py | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools-webrtc/mb/mb.py b/tools-webrtc/mb/mb.py
index eb92f239f0..49f681f9dc 100755
--- a/tools-webrtc/mb/mb.py
+++ b/tools-webrtc/mb/mb.py
@@ -1100,14 +1100,17 @@ class MetaBuildWrapper(object):
 
       gtest_parallel = (test_type != 'non_parallel_console_test_launcher' and
                         not memcheck)
-      gtest_parallel_wrapper = [
-          '../../third_party/gtest-parallel/gtest-parallel-wrapper.py'
-      ]
       if gtest_parallel:
         extra_files += [
             '../../third_party/gtest-parallel/gtest-parallel',
             '../../third_party/gtest-parallel/gtest-parallel-wrapper.py',
         ]
+        sep = '\\' if self.platform == 'win32' else '/'
+        output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs'
+        gtest_parallel_wrapper = [
+            '../../third_party/gtest-parallel/gtest-parallel-wrapper.py',
+            '--output_dir=%s' % output_dir,
+        ]
 
       asan = 'is_asan=true' in vals['gn_args']
       msan = 'is_msan=true' in vals['gn_args']
diff --git a/tools-webrtc/mb/mb_unittest.py b/tools-webrtc/mb/mb_unittest.py
index 3f9a6c9adb..f5c5bc272b 100755
--- a/tools-webrtc/mb/mb_unittest.py
+++ b/tools-webrtc/mb/mb_unittest.py
@@ -504,6 +504,7 @@ class UnitTest(unittest.TestCase):
     self.assertEqual(command, [
         '../../testing/xvfb.py',
         '../../third_party/gtest-parallel/gtest-parallel-wrapper.py',
+        '--output_dir=${ISOLATED_OUTDIR}/test_logs',
         './base_unittests',
         '--',
         '--asan=0',
@@ -548,6 +549,7 @@ class UnitTest(unittest.TestCase):
     self.assertEqual(command, [
         '../../testing/test_env.py',
         '../../third_party/gtest-parallel/gtest-parallel-wrapper.py',
+        '--output_dir=${ISOLATED_OUTDIR}\\test_logs',
         r'.\unittests.exe',
         '--',
         '--asan=0',
@@ -588,6 +590,7 @@ class UnitTest(unittest.TestCase):
     self.assertEqual(command, [
         '../../testing/test_env.py',
         '../../third_party/gtest-parallel/gtest-parallel-wrapper.py',
+        '--output_dir=${ISOLATED_OUTDIR}/test_logs',
         './base_unittests',
         '--',
         '--asan=0',