Add the output_dir and timeout arguments to gtest_parallel_wrapper.py

gtest-parallel-wrapper.py

 #!/usr/bin/env python
 
 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
@@ skipping 41 matching lines @@
 gtest_parallel_path = os.path.dirname(os.path.abspath(__file__))
 gtest_parallel_path = os.path.join(gtest_parallel_path, 'gtest-parallel')
 
 # Ignore '--'. Options unprocessed by this script will be passed to the test as
 # arguments.
 if '--' in sys.argv:
   del sys.argv[sys.argv.index('--')]
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--isolated-script-test-output', type=str, default=None)
+parser.add_argument('--output_dir', type=str, default=None)
+parser.add_argument('--timeout', type=int, default=None)
 
 options, unprocessed = parser.parse_known_args()
 test_executable = unprocessed[0]
 test_arguments = unprocessed[1:]
 
 gtest_args = [
     test_executable,
     '--shard_count',
     gtest_total_shards,
     '--shard_index',
     gtest_shard_index,
 ]
 
 # --isolated-script-test-output is used to upload results to the flakiness
 # dashboard. This translation is made because gtest-parallel expects the flag to
 # be called --dump_json_test_results instead.
 if options.isolated_script_test_output:
   gtest_args += [
       '--dump_json_test_results',
       options.isolated_script_test_output,
   ]
 
+if options.output_dir:
+  gtest_args += [
+      '--output_dir',
+      options.output_dir,
+  ]
+
+if options.timeout:
+  gtest_args += [
+      '--timeout',
+      str(options.timeout),
+  ]
+
 command = [
     sys.executable,
     gtest_parallel_path,
 ] + gtest_args + ['--'] + test_arguments
 
 print 'gtest-parallel-wrapper: Executing command %s' % ' '.join(command)
 sys.stdout.flush()
 
 sys.exit(subprocess.call(command, env=test_env, cwd=os.getcwd()))