Skip to content

Commit

Permalink
Fix other.test_emrun on build slaves, which pass EMSCRIPTEN_BROWSER="…
Browse files Browse the repository at this point in the history
…/path/to/firefox -profile /path/to/profile" which confused the emrun test treat it as whole as an executable name.
  • Loading branch information
juj committed Oct 7, 2015
1 parent 0d678bf commit 7659eed
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tests/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1847,7 +1847,9 @@ def test_emrun(self):
os.chdir(path_from_root())
args = [PYTHON, path_from_root('emrun'), '--timeout', '30', '--safe_firefox_profile', '--verbose', '--log_stdout', os.path.join(outdir, 'stdout.txt'), '--log_stderr', os.path.join(outdir, 'stderr.txt')]
if emscripten_browser is not None:
args += ['--browser', emscripten_browser]
# If EMSCRIPTEN_BROWSER carried command line arguments to pass to the browser, (e.g. "firefox -profile /path/to/foo") those can't be passed via emrun, so strip them out.
browser_name = shlex.split(emscripten_browser)[0]
args += ['--browser', browser_name]
args += [os.path.join(outdir, 'hello_world.html'), '1', '2', '--3']
process = subprocess.Popen(args)
process.communicate()
Expand Down

0 comments on commit 7659eed

Please sign in to comment.