Fix a bug when using gtest-parallel on swarming (plus flag related changes).

third_party/gtest-parallel/gtest-parallel

-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright 2013 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 247 matching lines @@
 parser.add_option('--gtest_color', type='string', default='yes',
                   help='color output')
 parser.add_option('--gtest_filter', type='string', default='',
                   help='test filter')
 parser.add_option('--gtest_also_run_disabled_tests', action='store_true',
                   default=False, help='run disabled tests too')
 parser.add_option('--format', type='string', default='filter',
                   help='output format (raw,filter)')
 parser.add_option('--print_test_times', action='store_true', default=False,
                   help='When done, list the run time of each test')
-parser.add_option('--shard-count', type='int',
-                  default=int(os.environ.get('GTEST_TOTAL_SHARDS', 1)),
+parser.add_option('--shard_count', type='int',
+                  default=int(os.environ.pop('GTEST_TOTAL_SHARDS', 1)),
                   help=('Total number of shards (for sharding test execution '
                         'between multiple machines). Default: %default'))
-parser.add_option('--shard-index', type='int',
-                  default=int(os.environ.get('GTEST_SHARD_INDEX', 0)),
+parser.add_option('--shard_index', type='int',
+                  default=int(os.environ.pop('GTEST_SHARD_INDEX', 0)),
                   help=('Zero-indexed number identifying this shard (for '
                         'sharding test execution between multiple machines). '
                         'Default: %default'))
 
 (options, binaries) = parser.parse_args()
 
 if binaries == []:
   parser.print_usage()
   sys.exit(1)
 
 logger = RawFormat()
 if options.format == 'raw':
   pass
 elif options.format == 'filter':
   logger = FilterFormat()
 else:
   sys.exit("Unknown output format: " + options.format)
 
+if options.shard_count < 1:
+  sys.exit("Invalid number of shards: %d. Must be at least 1." %
+           options.shard_count)
+if options.shard_index < 0 or options.shard_count <= options.shard_index:
+  sys.exit("Invalid shard index: %d. Must be between 0 and %d." %
+           (options.shard_index, options.shard_count - 1))
+
+
 # Find tests.
 save_file = os.path.join(os.path.expanduser("~"), ".gtest-parallel-times")
 times = TestTimes(save_file)
 tests = []
 for test_binary in binaries:
   command = [test_binary]
   if options.gtest_also_run_disabled_tests:
     command += ['--gtest_also_run_disabled_tests']
 
   list_command = list(command)
@@ skipping 110 matching lines @@
 [t.join() for t in workers]
 logger.end()
 times.write_to_file(save_file)
 if options.print_test_times:
   ts = sorted((times.get_test_time(test_binary, test), test_binary, test)
               for (_, test_binary, test, _) in tests
               if times.get_test_time(test_binary, test) is not None)
   for (time_ms, test_binary, test) in ts:
     print "%8s %s" % ("%dms" % time_ms, test)
 sys.exit(-signal.SIGINT if sigint_handler.got_sigint() else exit_code)