summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjrg@google.com <jrg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 23:07:55 +0000
committerjrg@google.com <jrg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 23:07:55 +0000
commit3dd3f2981096399afc77efb00a76999fb7fd101f (patch)
tree3ff2f43a3f8622c34a73a1fa934ef61a4ef4ed8f /build
parenta4dcec15a18e671e9927aa390829ab8f8f5e9b1f (diff)
downloadchromium_src-3dd3f2981096399afc77efb00a76999fb7fd101f.zip
chromium_src-3dd3f2981096399afc77efb00a76999fb7fd101f.tar.gz
chromium_src-3dd3f2981096399afc77efb00a76999fb7fd101f.tar.bz2
Jack up timeouts for buildbots running android tests.
BUG= TEST= Review URL: http://codereview.chromium.org/8622002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/android/test_package.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/android/test_package.py b/build/android/test_package.py
index 1f267e6..d81f0fc 100644
--- a/build/android/test_package.py
+++ b/build/android/test_package.py
@@ -48,6 +48,9 @@ class TestPackage(object):
timeout = 900
else:
timeout = 60
+ # On a VM (e.g. chromium buildbots), this timeout is way too small.
+ if os.environ.get('BUILDBOT_SLAVENAME'):
+ timeout = timeout * 2
self.timeout = timeout * self.tool.GetTimeoutScale()
self.dump_debug_info = dump_debug_info