Index: build/android/test_package.py |
diff --git a/build/android/test_package.py b/build/android/test_package.py |
index 1f267e63e38f74a3adbde14d17b462cdee709732..d81f0fce6819b596803486217dd4fda1b18adaca 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'): |
michaelbai
2011/11/21 23:05:53
What's if the environment was not set in dev machi
John Grabowski
2011/11/21 23:07:13
No; it returns None. That's why I'm using get() i
|
+ timeout = timeout * 2 |
self.timeout = timeout * self.tool.GetTimeoutScale() |
self.dump_debug_info = dump_debug_info |