summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 23:01:12 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 23:01:12 +0000
commitfabda0b3389fe1f78cfe4b2357fb44b4688f12bf (patch)
tree498f56303e66c4ad4538488b27502ea1a46fe5c1 /chrome/test
parent368dd013b4f4b6543cac5ab50bed50df31a75680 (diff)
downloadchromium_src-fabda0b3389fe1f78cfe4b2357fb44b4688f12bf.zip
chromium_src-fabda0b3389fe1f78cfe4b2357fb44b4688f12bf.tar.gz
chromium_src-fabda0b3389fe1f78cfe4b2357fb44b4688f12bf.tar.bz2
Change in fetching the builds for linux
This change accommodates fetching 32bit and 64bit binaries for linux. BUG=none TEST=none Review URL: http://codereview.chromium.org/5608002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/pyautolib/fetch_prebuilt_pyauto.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
index d2bb5e9..8b3d3b6 100644
--- a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
+++ b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
@@ -55,7 +55,8 @@ class FetchPrebuilt(object):
self._url = self._args[0]
# Setup urls to download
- self._chrome_zip_name = 'chrome-%s' % { 'linux': 'linux',
+ self._chrome_zip_name = 'chrome-%s' % { 'linux64': 'linux64bit',
+ 'linux32': 'linux32bit',
'mac': 'mac',
'win': 'win32'
}[self._options.platform]
@@ -63,7 +64,8 @@ class FetchPrebuilt(object):
chrome_test_url = '%s/%s.test' % (self._url, self._chrome_zip_name)
self._pyautolib_py_url = '%s/pyautolib.py' % chrome_test_url
self._pyautolib_so_url = '%s/%s' % (chrome_test_url,
- { 'linux': 'lib.target/_pyautolib.so',
+ { 'linux64': 'lib.target/_pyautolib.so',
+ 'linux32': 'lib.target/_pyautolib.so',
'mac': '_pyautolib.so',
'win': '_pyautolib.pyd',
}[self._options.platform])
@@ -95,7 +97,8 @@ class FetchPrebuilt(object):
items_to_copy = {
pyautolib_py: os.path.join(self._outdir, 'pyautolib.py'),
pyautolib_so: os.path.join(self._outdir,
- { 'linux': '_pyautolib.so',
+ { 'linux64': '_pyautolib.so',
+ 'linux32': '_pyautolib.so',
'mac': '_pyautolib.so',
'win': '_pyautolib.pyd'
}[self._options.platform])