summaryrefslogtreecommitdiffstats
path: root/tools/parallel_launcher
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 20:39:27 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 20:39:27 +0000
commit4b833b4419eccb5e1bc30c6d3c8829ca952939e6 (patch)
tree13c0dc0d908129a0cf891cfcc9ccf5cf8cf9599b /tools/parallel_launcher
parentdee6c70aa294bbd7df4c9b092af8995caa8a46fd (diff)
downloadchromium_src-4b833b4419eccb5e1bc30c6d3c8829ca952939e6.zip
chromium_src-4b833b4419eccb5e1bc30c6d3c8829ca952939e6.tar.gz
chromium_src-4b833b4419eccb5e1bc30c6d3c8829ca952939e6.tar.bz2
GTTF: Make the parallel launcher use different ports for test https servers for different shards.
BUG=54098 TEST=none Review URL: http://codereview.chromium.org/3452001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/parallel_launcher')
-rwxr-xr-xtools/parallel_launcher/parallel_launcher.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/parallel_launcher/parallel_launcher.py b/tools/parallel_launcher/parallel_launcher.py
index 1e5f6ff..85e4182 100755
--- a/tools/parallel_launcher/parallel_launcher.py
+++ b/tools/parallel_launcher/parallel_launcher.py
@@ -71,7 +71,10 @@ class TestLauncher(object):
env = os.environ.copy()
env['GTEST_TOTAL_SHARDS'] = str(self._num_shards)
env['GTEST_SHARD_INDEX'] = str(self._shard)
- self._test = subprocess.Popen(args=self._args,
+
+ args = self._args + ['--test-server-shard=' + str(self._shard)]
+
+ self._test = subprocess.Popen(args=args,
executable=self._executable,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,