Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Side by Side Diff: ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py

Issue 11412294: NaCl: Stop disabling the sandbox on Linux for testing in nacl_integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import os.path 6 import os.path
7 import re 7 import re
8 import shutil 8 import shutil
9 import sys 9 import sys
10 import tempfile 10 import tempfile
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 # Unfortunately, the browser tester can randomly choose a 279 # Unfortunately, the browser tester can randomly choose a
280 # blacklisted port. To work around this, the tester whitelists 280 # blacklisted port. To work around this, the tester whitelists
281 # whatever port it is using. 281 # whatever port it is using.
282 '--explicitly-allowed-ports=%d' % port, 282 '--explicitly-allowed-ports=%d' % port,
283 '--user-data-dir=%s' % self.profile] 283 '--user-data-dir=%s' % self.profile]
284 # Log network requests to assist debugging. 284 # Log network requests to assist debugging.
285 cmd.append('--log-net-log=%s' % self.NetLogName()) 285 cmd.append('--log-net-log=%s' % self.NetLogName())
286 if self.options.ppapi_plugin is None: 286 if self.options.ppapi_plugin is None:
287 cmd.append('--enable-nacl') 287 cmd.append('--enable-nacl')
288 disable_sandbox = False 288 disable_sandbox = False
289 # Sandboxing Chrome on Linux requires a SUIDed helper binary. This
290 # binary may not be installed, so disable sandboxing to avoid the
291 # corner cases where it may fail. This is a little scarry, because it
292 # means we are not testing NaCl inside the outer sandbox on Linux.
293 disable_sandbox |= PLATFORM == 'linux'
294 # Chrome process can't access file within sandbox 289 # Chrome process can't access file within sandbox
295 disable_sandbox |= self.options.nacl_exe_stdin is not None 290 disable_sandbox |= self.options.nacl_exe_stdin is not None
296 disable_sandbox |= self.options.nacl_exe_stdout is not None 291 disable_sandbox |= self.options.nacl_exe_stdout is not None
297 disable_sandbox |= self.options.nacl_exe_stderr is not None 292 disable_sandbox |= self.options.nacl_exe_stderr is not None
298 if disable_sandbox: 293 if disable_sandbox:
299 cmd.append('--no-sandbox') 294 cmd.append('--no-sandbox')
300 else: 295 else:
301 cmd.append('--register-pepper-plugins=%s;application/x-nacl' 296 cmd.append('--register-pepper-plugins=%s;application/x-nacl'
302 % self.options.ppapi_plugin) 297 % self.options.ppapi_plugin)
303 cmd.append('--no-sandbox') 298 cmd.append('--no-sandbox')
(...skipping 21 matching lines...) Expand all
325 '--trace-children=yes', 320 '--trace-children=yes',
326 '--nacl-file=%s' % (self.options.files[0],), 321 '--nacl-file=%s' % (self.options.files[0],),
327 '--ignore=../tools/valgrind/tsan/ignores.txt', 322 '--ignore=../tools/valgrind/tsan/ignores.txt',
328 '--suppressions=../tools/valgrind/tsan/suppressions.txt', 323 '--suppressions=../tools/valgrind/tsan/suppressions.txt',
329 '--log-file=%s/log.%%p' % (self.tool_log_dir,)] + cmd 324 '--log-file=%s/log.%%p' % (self.tool_log_dir,)] + cmd
330 elif self.options.tool != None: 325 elif self.options.tool != None:
331 raise LaunchFailure('Invalid tool name "%s"' % (self.options.tool,)) 326 raise LaunchFailure('Invalid tool name "%s"' % (self.options.tool,))
332 cmd.extend(self.options.browser_flags) 327 cmd.extend(self.options.browser_flags)
333 cmd.append(url) 328 cmd.append(url)
334 return cmd 329 return cmd
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698