Index: gtest-parallel-wrapper.py |
diff --git a/gtest-parallel-wrapper.py b/gtest-parallel-wrapper.py |
index 1884ba04e70123c301ee27a2a24775891908e3af..d5b9b78ae50d3b2e4022cb93f20d62bf54843faf 100755 |
--- a/gtest-parallel-wrapper.py |
+++ b/gtest-parallel-wrapper.py |
@@ -59,6 +59,8 @@ if '--' in sys.argv: |
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] |
@@ -81,6 +83,18 @@ if options.isolated_script_test_output: |
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, |