From f549dffa7b9f0f554d1bc7eeaa54b9f1d0097ee6 Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Tue, 18 Jul 2017 08:16:18 -0700 Subject: [PATCH] Fix gtest-parallel-wrapper It doesn't work when '--' is not part of the command line. It executed "gtest-parallel gtest-parallel-wrapper.py executable_name" instead of "gtets-parallel executable_name". NOTRY=True TBR=kjellander@webrtc.org BUG=None Review-Url: https://codereview.webrtc.org/2982133002 Cr-Commit-Position: refs/heads/master@{#19077} --- tools_webrtc/gtest-parallel-wrapper.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools_webrtc/gtest-parallel-wrapper.py b/tools_webrtc/gtest-parallel-wrapper.py index c3a0649d03..e7a659f286 100755 --- a/tools_webrtc/gtest-parallel-wrapper.py +++ b/tools_webrtc/gtest-parallel-wrapper.py @@ -64,10 +64,10 @@ def CatFiles(file_list, output_file): def get_args_and_env(): - if '--' not in sys.argv: - return sys.argv, os.environ - - argv_index = sys.argv.index('--') + if '--' in sys.argv: + argv_index = sys.argv.index('--') + else: + argv_index = len(sys.argv) gtest_parallel_args = sys.argv[1:argv_index] executable_args = sys.argv[argv_index + 1:]