diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 16:55:52 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 16:55:52 +0000 |
| commit | c23b33bbb13461c4e43b6111304230b60387c5ad (patch) | |
| tree | 36dc58dd2f251eda8a300f18ce7aedccd5031625 /ppapi | |
| parent | f80880ac4fb929c4b044d5bf80156986dddeb439 (diff) | |
| download | chromium_src-c23b33bbb13461c4e43b6111304230b60387c5ad.zip chromium_src-c23b33bbb13461c4e43b6111304230b60387c5ad.tar.gz chromium_src-c23b33bbb13461c4e43b6111304230b60387c5ad.tar.bz2 | |
Fix native client failures on mac by only using Mesa on Linux.
BUG=125106
R=binji@chromium.org, bradnelson@google.com, piman@chromium.org
Review URL: https://codereview.chromium.org/26621002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rwxr-xr-x | ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py index 3b258ee..c27ece5 100755 --- a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py +++ b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py @@ -284,9 +284,6 @@ class ChromeLauncher(BrowserLauncher): # Suppress metrics reporting. This prevents misconfigured bots, # people testing at their desktop, etc from poisoning the UMA data. '--metrics-recording-only', - # Explicitly run with mesa. The test infrastructure doesn't have - # sufficient native GL contextes to run these tests. - '--use-gl=osmesa', # Chrome explicitly blacklists some ports as "unsafe" because # certain protocols use them. Chrome gives an error like this: # Error 312 (net::ERR_UNSAFE_PORT): Unknown error @@ -297,6 +294,10 @@ class ChromeLauncher(BrowserLauncher): '--user-data-dir=%s' % self.profile] # Log network requests to assist debugging. cmd.append('--log-net-log=%s' % self.NetLogName()) + if PLATFORM == 'linux': + # Explicitly run with mesa on linux. The test infrastructure doesn't have + # sufficient native GL contextes to run these tests. + cmd.append('--use-gl=osmesa') if self.options.ppapi_plugin is None: cmd.append('--enable-nacl') disable_sandbox = False |