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

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

Issue 20370002: Remove some old support for PNaCl Scons browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: some tests Created 7 years, 5 months 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 | « ppapi/native_client/tools/browser_tester/browser_tester.py ('k') | 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 raise LaunchFailure('Browser does not exist %r'% browser_path) 181 raise LaunchFailure('Browser does not exist %r'% browser_path)
182 if not os.access(browser_path, os.X_OK): 182 if not os.access(browser_path, os.X_OK):
183 raise LaunchFailure('Browser cannot be executed %r (Is this binary on an ' 183 raise LaunchFailure('Browser cannot be executed %r (Is this binary on an '
184 'NFS volume?)' % browser_path) 184 'NFS volume?)' % browser_path)
185 if self.options.sel_ldr: 185 if self.options.sel_ldr:
186 env['NACL_SEL_LDR'] = self.options.sel_ldr 186 env['NACL_SEL_LDR'] = self.options.sel_ldr
187 if self.options.sel_ldr_bootstrap: 187 if self.options.sel_ldr_bootstrap:
188 env['NACL_SEL_LDR_BOOTSTRAP'] = self.options.sel_ldr_bootstrap 188 env['NACL_SEL_LDR_BOOTSTRAP'] = self.options.sel_ldr_bootstrap
189 if self.options.irt_library: 189 if self.options.irt_library:
190 env['NACL_IRT_LIBRARY'] = self.options.irt_library 190 env['NACL_IRT_LIBRARY'] = self.options.irt_library
191 if self.options.prefer_portable_in_manifest:
192 env['NACL_PREFER_PORTABLE_IN_MANIFEST'] = '1'
193 self.SetStandardStream(env, 'NACL_EXE_STDIN', 191 self.SetStandardStream(env, 'NACL_EXE_STDIN',
194 self.options.nacl_exe_stdin, False) 192 self.options.nacl_exe_stdin, False)
195 self.SetStandardStream(env, 'NACL_EXE_STDOUT', 193 self.SetStandardStream(env, 'NACL_EXE_STDOUT',
196 self.options.nacl_exe_stdout, True) 194 self.options.nacl_exe_stdout, True)
197 self.SetStandardStream(env, 'NACL_EXE_STDERR', 195 self.SetStandardStream(env, 'NACL_EXE_STDERR',
198 self.options.nacl_exe_stderr, True) 196 self.options.nacl_exe_stderr, True)
199 print 'ENV:', ' '.join(['='.join(pair) for pair in env.iteritems()]) 197 print 'ENV:', ' '.join(['='.join(pair) for pair in env.iteritems()])
200 print 'LAUNCHING: %s' % ' '.join(cmd) 198 print 'LAUNCHING: %s' % ' '.join(cmd)
201 sys.stdout.flush() 199 sys.stdout.flush()
202 self.browser_process = RunCommand(cmd, env=env) 200 self.browser_process = RunCommand(cmd, env=env)
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 '--trace-children=yes', 331 '--trace-children=yes',
334 '--nacl-file=%s' % (self.options.files[0],), 332 '--nacl-file=%s' % (self.options.files[0],),
335 '--ignore=../tools/valgrind/tsan/ignores.txt', 333 '--ignore=../tools/valgrind/tsan/ignores.txt',
336 '--suppressions=../tools/valgrind/tsan/suppressions.txt', 334 '--suppressions=../tools/valgrind/tsan/suppressions.txt',
337 '--log-file=%s/log.%%p' % (self.tool_log_dir,)] + cmd 335 '--log-file=%s/log.%%p' % (self.tool_log_dir,)] + cmd
338 elif self.options.tool != None: 336 elif self.options.tool != None:
339 raise LaunchFailure('Invalid tool name "%s"' % (self.options.tool,)) 337 raise LaunchFailure('Invalid tool name "%s"' % (self.options.tool,))
340 cmd.extend(self.options.browser_flags) 338 cmd.extend(self.options.browser_flags)
341 cmd.append(url) 339 cmd.append(url)
342 return cmd 340 return cmd
OLDNEW
« no previous file with comments | « ppapi/native_client/tools/browser_tester/browser_tester.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698