summaryrefslogtreecommitdiffstats
path: root/tools/sharding_supervisor
diff options
context:
space:
mode:
authorcharleslee@chromium.org <charleslee@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 20:47:09 +0000
committercharleslee@chromium.org <charleslee@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 20:47:09 +0000
commita3a62191e80559303e48f648d9b8f260b0aad3a3 (patch)
tree0e95ce1bfba53a6e5b52ceadea71120170a61807 /tools/sharding_supervisor
parent96e867d99f62bc1d34fee7c1df0b3602acea4862 (diff)
downloadchromium_src-a3a62191e80559303e48f648d9b8f260b0aad3a3.zip
chromium_src-a3a62191e80559303e48f648d9b8f260b0aad3a3.tar.gz
chromium_src-a3a62191e80559303e48f648d9b8f260b0aad3a3.tar.bz2
Allow ui_tests to be run in parallel
Added an environment variable for CHROME_LOG_FILE TEST=ui_tests pass when run with sharding_supervisor Review URL: http://codereview.chromium.org/7554013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/sharding_supervisor')
-rwxr-xr-xtools/sharding_supervisor/sharding_supervisor.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/sharding_supervisor/sharding_supervisor.py b/tools/sharding_supervisor/sharding_supervisor.py
index e7774db..fc2bd1b 100755
--- a/tools/sharding_supervisor/sharding_supervisor.py
+++ b/tools/sharding_supervisor/sharding_supervisor.py
@@ -65,6 +65,11 @@ def RunShard(test, num_shards, index, gtest_args, stdout, stderr):
env = os.environ.copy()
env["GTEST_TOTAL_SHARDS"] = str(num_shards)
env["GTEST_SHARD_INDEX"] = str(index)
+
+ # Use a unique log file for each shard
+ # Allows ui_tests to be run in parallel on the same machine
+ env["CHROME_LOG_FILE"] = "chrome_log_%d" % index
+
return subprocess.Popen(
args, stdout=stdout, stderr=stderr, env=env, bufsize=0)