diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 20:32:57 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 20:32:57 +0000 |
| commit | 815a0099d612c4b0c7369a4c6ab866c9f851fb19 (patch) | |
| tree | 2c2de6963b1eda5dbba54b11d7e5877589afa584 /ppapi | |
| parent | 40aa8bba1fa8d2e5faeb7a0f4f6ecd694a1ac2b1 (diff) | |
| download | chromium_src-815a0099d612c4b0c7369a4c6ab866c9f851fb19.zip chromium_src-815a0099d612c4b0c7369a4c6ab866c9f851fb19.tar.gz chromium_src-815a0099d612c4b0c7369a4c6ab866c9f851fb19.tar.bz2 | |
[NaCl SDK] Add example test for core.
BUG=none
R=ncbray@chromium.org, sbc@chromium.org
Review URL: https://codereview.chromium.org/23248005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rwxr-xr-x | ppapi/native_client/tools/browser_tester/browser_tester.py | 4 | ||||
| -rwxr-xr-x | ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ppapi/native_client/tools/browser_tester/browser_tester.py b/ppapi/native_client/tools/browser_tester/browser_tester.py index ab24d0c..c01f4e3c 100755 --- a/ppapi/native_client/tools/browser_tester/browser_tester.py +++ b/ppapi/native_client/tools/browser_tester/browser_tester.py @@ -73,6 +73,10 @@ def BuildArgParser(): parser.add_option('--ppapi_plugin', dest='ppapi_plugin', action='store', type='string', default=None, help='Use the browser plugin located here.') + parser.add_option('--ppapi_plugin_mimetype', dest='ppapi_plugin_mimetype', + action='store', type='string', default='application/x-nacl', + help='Associate this mimetype with the browser plugin. ' + 'Unused if --ppapi_plugin is not specified.') parser.add_option('--sel_ldr', dest='sel_ldr', action='store', type='string', default=None, help='Use the sel_ldr located here.') diff --git a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py index 5631690..67ea291 100755 --- a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py +++ b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py @@ -304,8 +304,9 @@ class ChromeLauncher(BrowserLauncher): if disable_sandbox: cmd.append('--no-sandbox') else: - cmd.append('--register-pepper-plugins=%s;application/x-nacl' - % self.options.ppapi_plugin) + cmd.append('--register-pepper-plugins=%s;%s' + % (self.options.ppapi_plugin, + self.options.ppapi_plugin_mimetype)) cmd.append('--no-sandbox') if self.options.browser_extensions: cmd.append('--load-extension=%s' % |