diff options
author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 21:39:01 +0000 |
---|---|---|
committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 21:39:01 +0000 |
commit | bd1d01bf803f150101058b183c9512fb8e9731c7 (patch) | |
tree | e6311d963ccc3fd9afdf3e8be6ac37a79f5c034c /chrome/test/pyautolib/fetch_prebuilt_pyauto.py | |
parent | 90ac5e00f524c612885508c54df16707af4eb6fd (diff) | |
download | chromium_src-bd1d01bf803f150101058b183c9512fb8e9731c7.zip chromium_src-bd1d01bf803f150101058b183c9512fb8e9731c7.tar.gz chromium_src-bd1d01bf803f150101058b183c9512fb8e9731c7.tar.bz2 |
Update fetch_prebuilt_pyauto.py to include ffmpegsumo.so on Mac
ffmpegsumo.so is now necessary to run pyauto tests on Mac.
BUG=135055
TEST=None
R=dennisjeffrey@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10696085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib/fetch_prebuilt_pyauto.py')
-rwxr-xr-x | chrome/test/pyautolib/fetch_prebuilt_pyauto.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py index 617ffac..5f39c2c 100755 --- a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py +++ b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py @@ -97,6 +97,9 @@ class FetchPrebuilt(object): else: self._pyautolib_so_name = '_pyautolib.so' self._chromedriver_name = 'chromedriver' + if self._options.platform == 'mac': + self._ffmpegsumo_so_name = 'ffmpegsumo.so' + self._ffmpegsumo_so_url = chrome_test_url + '/' + self._ffmpegsumo_so_name self._pyautolib_so_url = chrome_test_url + '/' + self._pyautolib_so_name self._chromedriver_url = chrome_test_url + '/' + self._chromedriver_name @@ -156,6 +159,10 @@ class FetchPrebuilt(object): print 'Fetching', self._pyautolib_so_url pyautolib_so = urllib.urlretrieve(self._pyautolib_so_url)[0] + if self._options.platform == 'mac': + print 'Fetching', self._ffmpegsumo_so_url + ffmpegsumo_so = urllib.urlretrieve(self._ffmpegsumo_so_url)[0] + print 'Fetching', self._chromedriver_url chromedriver = urllib.urlretrieve(self._chromedriver_url)[0] @@ -176,6 +183,10 @@ class FetchPrebuilt(object): pyautolib_so: os.path.join(self._outdir, self._pyautolib_so_name), chromedriver: os.path.join(self._outdir, self._chromedriver_name) } + if self._options.platform == 'mac': + items_to_copy[ffmpegsumo_so] = \ + os.path.join(self._outdir, self._ffmpegsumo_so_name) + unzip_dir_contents = glob.glob(os.path.join(chrome_unzip_dir, '*')) for item in unzip_dir_contents: name = os.path.basename(item) |